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

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

This commit is contained in:
paweldomas 2015-03-04 13:56:45 +01:00
parent 1825f47ef2
commit e465b3ed90
3 changed files with 17200 additions and 17204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

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

786
libs/app.bundle.js
View File

File diff suppressed because it is too large Load Diff

4
modules/xmpp/xmpp.js
View File

@ -251,9 +251,7 @@ var XMPP = {
connection.jingle.activecall.switchStreams(stream, oldStream, callback); connection.jingle.activecall.switchStreams(stream, oldStream, callback);
} else { } else {
// We are done immediately // We are done immediately
console.error("No conference handler"); console.warn("No conference handler or conference not started yet");
APP.UI.messageHandler.showError("dialog.error",
"dialog.unableToSwitch");
callback(); callback();
} }
}, },