Bladeren bron

Removes unnecessary error dialog when desktop sharing is started before the conference.

j8
paweldomas 10 jaren geleden
bovenliggende
commit
e465b3ed90
3 gewijzigde bestanden met toevoegingen van 18213 en 18217 verwijderingen
  1. 1
    1
      index.html
  2. 18211
    18213
      libs/app.bundle.js
  3. 1
    3
      modules/xmpp/xmpp.js

+ 1
- 1
index.html Bestand weergeven

19
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
19
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
20
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
20
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
21
     <script src="interface_config.js?v=5"></script>
21
     <script src="interface_config.js?v=5"></script>
22
-    <script src="libs/app.bundle.js?v=26"></script>
22
+    <script src="libs/app.bundle.js?v=27"></script>
23
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
23
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
24
     <link rel="stylesheet" href="css/font.css?v=6"/>
24
     <link rel="stylesheet" href="css/font.css?v=6"/>
25
     <link rel="stylesheet" href="css/toastr.css?v=1">
25
     <link rel="stylesheet" href="css/toastr.css?v=1">

+ 18211
- 18213
libs/app.bundle.js
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


+ 1
- 3
modules/xmpp/xmpp.js Bestand weergeven

251
             connection.jingle.activecall.switchStreams(stream, oldStream, callback);
251
             connection.jingle.activecall.switchStreams(stream, oldStream, callback);
252
         } else {
252
         } else {
253
             // We are done immediately
253
             // We are done immediately
254
-            console.error("No conference handler");
255
-            APP.UI.messageHandler.showError("dialog.error",
256
-                "dialog.unableToSwitch");
254
+            console.warn("No conference handler or conference not started yet");
257
             callback();
255
             callback();
258
         }
256
         }
259
     },
257
     },

Laden…
Annuleren
Opslaan