-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
56 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| /*! | ||
| * ijsxc v1.0.0-beta1 - 2014-10-29 | ||
| * ijsxc v1.0.0-beta2 - 2014-10-31 | ||
| * | ||
| * Copyright (c) 2014 Klaus Herberth <[email protected]> <br> | ||
| * Released under the MIT license | ||
| * | ||
| * Please see http://jsxc.org/ | ||
| * | ||
| * @author Klaus Herberth <[email protected]> | ||
| * @version 1.0.0-beta1 | ||
| * @version 1.0.0-beta2 | ||
| * @license MIT | ||
| */ | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| /*! | ||
| * ijsxc v1.0.0-beta1 - 2014-10-29 | ||
| * ijsxc v1.0.0-beta2 - 2014-10-31 | ||
| * | ||
| * Copyright (c) 2014 Klaus Herberth <[email protected]> <br> | ||
| * Released under the MIT license | ||
| * | ||
| * Please see http://jsxc.org/ | ||
| * | ||
| * @author Klaus Herberth <[email protected]> | ||
| * @version 1.0.0-beta1 | ||
| * @version 1.0.0-beta2 | ||
| * @license MIT | ||
| */ | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| /*! This file is concatenated for the browser. */ | ||
|
|
||
| /*! | ||
| * jsxc v1.0.0-beta1 - 2014-10-29 | ||
| * jsxc v1.0.0-beta2 - 2014-10-31 | ||
| * | ||
| * Copyright (c) 2014 Klaus Herberth <[email protected]> <br> | ||
| * Released under the MIT license | ||
| * | ||
| * Please see http://www.jsxc.org/ | ||
| * | ||
| * @author Klaus Herberth <[email protected]> | ||
| * @version 1.0.0-beta1 | ||
| * @version 1.0.0-beta2 | ||
| * @license MIT | ||
| */ | ||
|
|
||
|
|
@@ -25,7 +25,7 @@ var jsxc; | |
| */ | ||
| jsxc = { | ||
| /** Version of jsxc */ | ||
| version: '1.0.0-beta1', | ||
| version: '1.0.0-beta2', | ||
|
|
||
| /** True if i'm the master */ | ||
| master: false, | ||
|
|
@@ -2319,7 +2319,11 @@ var jsxc; | |
| var options = {}; | ||
| options = { | ||
| onComplete: function() { | ||
| $('#jsxc_dialog .jsxc_close').click(jsxc.gui.dialog.close); | ||
| $('#jsxc_dialog .jsxc_close').click(function(ev) { | ||
| ev.preventDefault(); | ||
|
|
||
| jsxc.gui.dialog.close(); | ||
| }); | ||
|
|
||
| // workaround for old colorbox version (used by firstrunwizard) | ||
| if (options.closeButton === false) { | ||
|
|
@@ -3338,6 +3342,7 @@ var jsxc; | |
| jsxc.storage.removeUserItem('windowlist'); | ||
| jsxc.storage.removeUserItem('own'); | ||
| jsxc.storage.removeUserItem('avatar', 'own'); | ||
| jsxc.storage.removeUserItem('otrlist'); | ||
|
|
||
| // submit login form | ||
| if (jsxc.triggeredFromForm) { | ||
|
|
@@ -3768,8 +3773,6 @@ var jsxc; | |
| return true; | ||
| } | ||
|
|
||
| $(document).trigger('message.jsxc', [ from, body ]); | ||
|
|
||
| var win = jsxc.gui.window.init(bid); | ||
|
|
||
| // If we now the full jid, we use it | ||
|
|
@@ -3780,6 +3783,8 @@ var jsxc; | |
| }); | ||
| } | ||
|
|
||
| $(document).trigger('message.jsxc', [ from, body ]); | ||
|
|
||
| // create related otr object | ||
| if (jsxc.master && !jsxc.otr.objects[bid]) { | ||
| jsxc.otr.create(bid); | ||
|
|
@@ -3947,7 +3952,7 @@ var jsxc; | |
| * @private | ||
| */ | ||
| _sendMessage: function(jid, msg, uid) { | ||
| var data = jsxc.storage.getUserItem('buddy', jsxc.jidToBid(jid)); | ||
| var data = jsxc.storage.getUserItem('buddy', jsxc.jidToBid(jid)) || {}; | ||
| var isBar = (Strophe.getBareJidFromJid(jid) === jid); | ||
| var type = data.type || 'chat'; | ||
|
|
||
|
|
@@ -5872,15 +5877,15 @@ var jsxc; | |
| }(jQuery)); | ||
|
|
||
| /*! | ||
| * jsxc v1.0.0-beta1 - 2014-10-29 | ||
| * jsxc v1.0.0-beta2 - 2014-10-31 | ||
| * | ||
| * Copyright (c) 2014 Klaus Herberth <[email protected]> <br> | ||
| * Released under the MIT license | ||
| * | ||
| * Please see http://www.jsxc.org/ | ||
| * | ||
| * @author Klaus Herberth <[email protected]> | ||
| * @version 1.0.0-beta1 | ||
| * @version 1.0.0-beta2 | ||
| * @license MIT | ||
| */ | ||
|
|
||
|
|
@@ -6073,11 +6078,12 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\ | |
| * Return list of video capable resources. | ||
| * | ||
| * @memberOf jsxc.webrtc | ||
| * @param bid | ||
| * @param jid | ||
| * @returns {Array} | ||
| */ | ||
| getCapableRes: function(bid) { | ||
| getCapableRes: function(jid) { | ||
| var self = jsxc.webrtc; | ||
| var bid = jsxc.jidToBid(jid); | ||
| var res = jsxc.storage.getUserItem('res', bid) || []; | ||
|
|
||
| var available = []; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| /*! | ||
| * jsxc v1.0.0-beta1 - 2014-10-29 | ||
| * jsxc v1.0.0-beta2 - 2014-10-31 | ||
| * | ||
| * Copyright (c) 2014 Klaus Herberth <[email protected]> <br> | ||
| * Released under the MIT license | ||
| * | ||
| * Please see http://www.jsxc.org/ | ||
| * | ||
| * @author Klaus Herberth <[email protected]> | ||
| * @version 1.0.0-beta1 | ||
| * @version 1.0.0-beta2 | ||
| * @license MIT | ||
| */ | ||
|
|
||
|
|
@@ -23,7 +23,7 @@ var jsxc; | |
| */ | ||
| jsxc = { | ||
| /** Version of jsxc */ | ||
| version: '1.0.0-beta1', | ||
| version: '1.0.0-beta2', | ||
|
|
||
| /** True if i'm the master */ | ||
| master: false, | ||
|
|
@@ -2317,7 +2317,11 @@ var jsxc; | |
| var options = {}; | ||
| options = { | ||
| onComplete: function() { | ||
| $('#jsxc_dialog .jsxc_close').click(jsxc.gui.dialog.close); | ||
| $('#jsxc_dialog .jsxc_close').click(function(ev) { | ||
| ev.preventDefault(); | ||
|
|
||
| jsxc.gui.dialog.close(); | ||
| }); | ||
|
|
||
| // workaround for old colorbox version (used by firstrunwizard) | ||
| if (options.closeButton === false) { | ||
|
|
@@ -3336,6 +3340,7 @@ var jsxc; | |
| jsxc.storage.removeUserItem('windowlist'); | ||
| jsxc.storage.removeUserItem('own'); | ||
| jsxc.storage.removeUserItem('avatar', 'own'); | ||
| jsxc.storage.removeUserItem('otrlist'); | ||
|
|
||
| // submit login form | ||
| if (jsxc.triggeredFromForm) { | ||
|
|
@@ -3766,8 +3771,6 @@ var jsxc; | |
| return true; | ||
| } | ||
|
|
||
| $(document).trigger('message.jsxc', [ from, body ]); | ||
|
|
||
| var win = jsxc.gui.window.init(bid); | ||
|
|
||
| // If we now the full jid, we use it | ||
|
|
@@ -3778,6 +3781,8 @@ var jsxc; | |
| }); | ||
| } | ||
|
|
||
| $(document).trigger('message.jsxc', [ from, body ]); | ||
|
|
||
| // create related otr object | ||
| if (jsxc.master && !jsxc.otr.objects[bid]) { | ||
| jsxc.otr.create(bid); | ||
|
|
@@ -3945,7 +3950,7 @@ var jsxc; | |
| * @private | ||
| */ | ||
| _sendMessage: function(jid, msg, uid) { | ||
| var data = jsxc.storage.getUserItem('buddy', jsxc.jidToBid(jid)); | ||
| var data = jsxc.storage.getUserItem('buddy', jsxc.jidToBid(jid)) || {}; | ||
| var isBar = (Strophe.getBareJidFromJid(jid) === jid); | ||
| var type = data.type || 'chat'; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| /*! | ||
| * jsxc v1.0.0-beta1 - 2014-10-29 | ||
| * jsxc v1.0.0-beta2 - 2014-10-31 | ||
| * | ||
| * Copyright (c) 2014 Klaus Herberth <[email protected]> <br> | ||
| * Released under the MIT license | ||
| * | ||
| * Please see http://www.jsxc.org/ | ||
| * | ||
| * @author Klaus Herberth <[email protected]> | ||
| * @version 1.0.0-beta1 | ||
| * @version 1.0.0-beta2 | ||
| * @license MIT | ||
| */ | ||
|
|
||
|
|
@@ -200,11 +200,12 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\ | |
| * Return list of video capable resources. | ||
| * | ||
| * @memberOf jsxc.webrtc | ||
| * @param bid | ||
| * @param jid | ||
| * @returns {Array} | ||
| */ | ||
| getCapableRes: function(bid) { | ||
| getCapableRes: function(jid) { | ||
| var self = jsxc.webrtc; | ||
| var bid = jsxc.jidToBid(jid); | ||
| var res = jsxc.storage.getUserItem('res', bid) || []; | ||
|
|
||
| var available = []; | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
build/js/jsxc/jsxc.dep.min.js → build/js/jsxc/lib/jsxc.dep.min.js
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
File renamed without changes.
Submodule jsxc
updated
from 8cd97e to a69b70
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters