浏览代码

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
master
Saúl Ibarra Corretgé 7 年前
父节点
当前提交
8b35ea8ad5
共有 5 个文件被更改,包括 11 次插入10 次删除
  1. 1
    0
      modules/UI/shared_video/SharedVideo.js
  2. 4
    4
      package-lock.json
  3. 1
    1
      package.json
  4. 4
    4
      react/features/dial-out/actions.js
  5. 1
    1
      react/features/invite/functions.js

+ 1
- 0
modules/UI/shared_video/SharedVideo.js 查看文件

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

+ 4
- 4
package-lock.json 查看文件

@@ -1160,7 +1160,7 @@
1160 1160
       "resolved": "https://registry.npmjs.org/autosize/-/autosize-1.18.13.tgz",
1161 1161
       "integrity": "sha1-7ljP8O2dzVDB/xB+culUAxyRl78=",
1162 1162
       "requires": {
1163
-        "jquery": "2.1.4"
1163
+        "jquery": "3.3.1"
1164 1164
       }
1165 1165
     },
1166 1166
     "aws-sign2": {
@@ -6980,9 +6980,9 @@
6980 6980
       "version": "github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e"
6981 6981
     },
6982 6982
     "jquery": {
6983
-      "version": "2.1.4",
6984
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.1.4.tgz",
6985
-      "integrity": "sha1-IoveaYoMYUMdwmMKahVPFYkNIxc="
6983
+      "version": "3.3.1",
6984
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
6985
+      "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
6986 6986
     },
6987 6987
     "jquery-contextmenu": {
6988 6988
       "version": "2.4.5",

+ 1
- 1
package.json 查看文件

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

+ 4
- 4
react/features/dial-out/actions.js 查看文件

@@ -61,12 +61,12 @@ export function checkDialNumber(dialNumber: string) {
61 61
         const fullUrl = `${dialOutAuthUrl}?phone=${dialNumber}`;
62 62
 
63 63
         $.getJSON(fullUrl)
64
-            .success(response =>
64
+            .then(response =>
65 65
                 dispatch({
66 66
                     type: PHONE_NUMBER_CHECKED,
67 67
                     response
68 68
                 }))
69
-            .error(error =>
69
+            .catch(error =>
70 70
                 dispatch({
71 71
                     type: DIAL_OUT_SERVICE_FAILED,
72 72
                     error
@@ -88,12 +88,12 @@ export function updateDialOutCodes() {
88 88
         }
89 89
 
90 90
         $.getJSON(dialOutCodesUrl)
91
-            .success(response =>
91
+            .then(response =>
92 92
                 dispatch({
93 93
                     type: DIAL_OUT_CODES_UPDATED,
94 94
                     response
95 95
                 }))
96
-            .error(error =>
96
+            .catch(error =>
97 97
                 dispatch({
98 98
                     type: DIAL_OUT_SERVICE_FAILED,
99 99
                     error

+ 1
- 1
react/features/invite/functions.js 查看文件

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

正在加载...
取消
保存