haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deps: update jquery version (#2441) 

* deps: update jquery version

* squash: resize thumbnails after appending shared thumb

This forces jquery animate to show the thumbnail somehow...
Remote thumbnails basically work this way (append to filmstrip
and then resize filmstrip thumbnails) so I just copied that
implementation. ... So I admit I lost this fight because
even after looking at jquery I couldn't understand why
it doesn't work on the first resize but does on the second.
Plus I'm being put on a strict timebox to update jquery.

* squash: getJSON no longer supports .success
This commit is contained in:
Saúl Ibarra Corretgé 2018-03-03 04:20:47 +01:00 committed by Дамян Минков
parent e05f2a9027
commit 8b35ea8ad5
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/UI/shared_video/SharedVideo.js
View File

@ -282,6 +282,7 @@ export default class SharedVideoManager {
thumb.setDisplayName('YouTube'); thumb.setDisplayName('YouTube');
VideoLayout.addRemoteVideoContainer(self.url, thumb); VideoLayout.addRemoteVideoContainer(self.url, thumb);
VideoLayout.resizeThumbnails(false, true);
const iframe = player.getIframe(); const iframe = player.getIframe();

8
package-lock.json generated
View File

@ -1160,7 +1160,7 @@
"resolved": "https://registry.npmjs.org/autosize/-/autosize-1.18.13.tgz", "resolved": "https://registry.npmjs.org/autosize/-/autosize-1.18.13.tgz",
"integrity": "sha1-7ljP8O2dzVDB/xB+culUAxyRl78=", "integrity": "sha1-7ljP8O2dzVDB/xB+culUAxyRl78=",
"requires": { "requires": {
"jquery": "2.1.4" "jquery": "3.3.1"
} }
}, },
"aws-sign2": { "aws-sign2": {
@ -6980,9 +6980,9 @@
"version": "github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e" "version": "github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e"
}, },
"jquery": { "jquery": {
"version": "2.1.4", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.1.4.tgz", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
"integrity": "sha1-IoveaYoMYUMdwmMKahVPFYkNIxc=" "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
}, },
"jquery-contextmenu": { "jquery-contextmenu": {
"version": "2.4.5", "version": "2.4.5",

2
package.json
View File

@ -39,7 +39,7 @@
"i18next-xhr-backend": "1.4.2", "i18next-xhr-backend": "1.4.2",
"jQuery-Impromptu": "github:trentrichardson/jQuery-Impromptu#v6.0.0", "jQuery-Impromptu": "github:trentrichardson/jQuery-Impromptu#v6.0.0",
"jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e", "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e",
"jquery": "2.1.4", "jquery": "3.3.1",
"jquery-contextmenu": "2.4.5", "jquery-contextmenu": "2.4.5",
"jquery-i18next": "1.2.0", "jquery-i18next": "1.2.0",
"js-md5": "0.6.1", "js-md5": "0.6.1",

8
react/features/dial-out/actions.js
View File

@ -61,12 +61,12 @@ export function checkDialNumber(dialNumber: string) {
const fullUrl = `${dialOutAuthUrl}?phone=${dialNumber}`; const fullUrl = `${dialOutAuthUrl}?phone=${dialNumber}`;
$.getJSON(fullUrl) $.getJSON(fullUrl)
.success(response => .then(response =>
dispatch({ dispatch({
type: PHONE_NUMBER_CHECKED, type: PHONE_NUMBER_CHECKED,
response response
})) }))
.error(error => .catch(error =>
dispatch({ dispatch({
type: DIAL_OUT_SERVICE_FAILED, type: DIAL_OUT_SERVICE_FAILED,
error error
@ -88,12 +88,12 @@ export function updateDialOutCodes() {
} }
$.getJSON(dialOutCodesUrl) $.getJSON(dialOutCodesUrl)
.success(response => .then(response =>
dispatch({ dispatch({
type: DIAL_OUT_CODES_UPDATED, type: DIAL_OUT_CODES_UPDATED,
response response
})) }))
.error(error => .catch(error =>
dispatch({ dispatch({
type: DIAL_OUT_SERVICE_FAILED, type: DIAL_OUT_SERVICE_FAILED,
error error

2
react/features/invite/functions.js
View File

@ -83,6 +83,6 @@ export function searchDirectory( // eslint-disable-line max-params
`${serviceUrl}?query=${encodeURIComponent(text)}&queryTypes=${ `${serviceUrl}?query=${encodeURIComponent(text)}&queryTypes=${
queryTypesString}&jwt=${jwt}`, queryTypesString}&jwt=${jwt}`,
resolve) resolve)
.fail((jqxhr, textStatus, error) => reject(error)); .catch((jqxhr, textStatus, error) => reject(error));
}); });
} }