build v2.1.1

otherwise safari will fail

CHANGELOG.md

@@ -1,3 +1,13 @@
+v2.1.1 / 2015-08-10
+===
+- update strophe.jingle (fix login with safari and older versions of ie, ff, chrome)
+- update favico.js
+- fix undefined error variable in ie
+- fix handling of escaped jids (e.g. used in transports)
+- fix placeholder replacement
+- rearrange bootstrap import
+- add option for custom online user manual
+
 v2.1.0 / 2015-07-31
 ===
 - add bookmark feature for rooms (XEP-0048)

Gruntfile.js

@@ -68,7 +68,7 @@ module.exports = function(grunt) {
             src: ['<%= target %>/jsxc.js'],
             overwrite: true,
             replacements: [{
-               from: '< $ dep.libraries $ >',
+               from: '<$ dep.libraries $>',
                to: function() {
                   var i, d, libraries = '';
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jsxc",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "homepage": "https://www.jsxc.org",
   "authors": [
     "sualko <klaus@jsxc.org>"
@@ -25,7 +25,7 @@
   ],
   "private": true,
   "dependencies": {
-    "favico.js": "~0.3.7",
+    "favico.js": "~0.3.9",
     "strophe.bookmarks": "https://raw.githubusercontent.com/sualko/strophejs-plugins/bookmarks/bookmarks/strophe.bookmarks.js",
     "strophe.x": "https://raw.githubusercontent.com/strophe/strophejs-plugins/master/dataforms/src/strophe.x.js"
   }

build/jsxc.js

@@ -1,5 +1,5 @@
 /*!
- * jsxc v2.1.0 - 2015-07-31
+ * jsxc v2.1.1 - 2015-08-10
  * 
  * Copyright (c) 2015 Klaus Herberth <klaus@jsxc.org> <br>
  * Released under the MIT license
@@ -7,7 +7,7 @@
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <klaus@jsxc.org>
- * @version 2.1.0
+ * @version 2.1.1
  * @license MIT
  */
 
@@ -25,7 +25,7 @@ var jsxc = null, RTC = null, RTCPeerconnection = null;
  */
 jsxc = {
    /** Version of jsxc */
-   version: '2.1.0',
+   version: '2.1.1',
 
    /** True if i'm the master */
    master: false,
@@ -649,7 +649,7 @@ jsxc = {
     * @returns comparable bar jid
     */
    jidToBid: function(jid) {
-      return Strophe.getBareJidFromJid(jid).toLowerCase();
+      return Strophe.unescapeNode(Strophe.getBareJidFromJid(jid).toLowerCase());
    },
 
    /**
@@ -3448,7 +3448,7 @@ jsxc.gui.roster = {
       });
 
       $('#jsxc_roster .jsxc_onlineHelp').click(function() {
-         window.open("http://www.jsxc.org/manual.html", "onlineHelp");
+         window.open(jsxc.options.onlineHelp, 'onlineHelp');
       });
 
       $('#jsxc_roster .jsxc_about').click(function() {
@@ -6594,7 +6594,10 @@ jsxc.options = {
       iceServers: [{
          urls: 'stun:stun.stunprotocol.org'
       }]
-   }
+   },
+
+   /** Link to an online user manual */
+   onlineHelp: 'http://www.jsxc.org/manual.html'
 };
 
 /**
@@ -7136,7 +7139,12 @@ jsxc.storage = {
       }
 
       if (typeof(value) === 'object') {
-         value = JSON.stringify(value);
+         // exclude jquery objects, because otherwise safari will fail
+         value = JSON.stringify(value, function(key, val) {
+            if (!(val instanceof jQuery)) {
+               return val;
+            }
+         });
       }
 
       localStorage.setItem(jsxc.storage.getPrefix(uk) + key, value);
@@ -8184,6 +8192,9 @@ jsxc.webrtc = {
     */
    onMediaFailure: function(ev, err) {
       var self = jsxc.webrtc;
+      err = err || {
+         name: 'Undefined'
+      };
 
       self.setStatus('media failure');
 
@@ -9062,7 +9073,7 @@ jsxc.gui.template['aboutDialog'] = '<h3>JavaScript XMPP Chat</h3>\n' +
 '</p>\n' +
 '<p class="jsxc_libraries">\n' +
 '   <b>Libraries: </b>\n' +
-'   < $ dep.libraries $>\n' +
+'   <a href="http://strophe.im/strophejs/">strophe.js</a> (multiple), <a href="https://github.com/strophe/strophejs-plugins">strophe.js/muc</a> (MIT), <a href="https://github.com/strophe/strophejs-plugins">strophe.js/disco</a> (MIT), <a href="https://github.com/strophe/strophejs-plugins">strophe.js/caps</a> (MIT), <a href="https://github.com/strophe/strophejs-plugins">strophe.js/vcard</a> (MIT), <a href="https://github.com/strophe/strophejs-plugins/tree/master/bookmarks">strophe.js/bookmarks</a> (MIT), <a href="https://github.com/strophe/strophejs-plugins/tree/master/dataforms">strophe.js/x</a> (MIT), <a href="https://github.com/sualko/strophe.jinglejs">strophe.jinglejs</a> (MIT), <a href="https://github.com/neoatlantis/node-salsa20">Salsa20</a> (AGPL3), <a href="www.leemon.com">bigint</a> (public domain), <a href="code.google.com/p/crypto-js">cryptojs</a> (code.google.com/p/crypto-js/wiki/license), <a href="http://git.io/ee">eventemitter</a> (MIT), <a href="https://arlolra.github.io/otr/">otr.js</a> (MPL v2.0), <a href="http://i18next.com/">i18next</a> (MIT), <a href="http://dimsemenov.com/plugins/magnific-popup/">Magnific Popup</a> (MIT), <a href="https://github.com/ejci/favico.js">favico.js</a> (MIT)\n' +
 '</p>\n' +
 '\n' +
 '<button class="btn btn-default pull-right jsxc_debuglog">Show debug log</button>\n' +

build/lib/favico.js/favico.js

@@ -2,7 +2,7 @@
  * @license MIT
  * @fileOverview Favico animations
  * @author Miroslav Magda, http://blog.ejci.net
- * @version 0.3.6
+ * @version 0.3.9
  */
 
 /**
@@ -18,7 +18,8 @@
  *    position : 'down',
  *    type : 'circle',
  *    animation : 'slide',
- *    dataUrl: function(url){}
+ *    dataUrl: function(url){},
+ *    win: top
  * });
  */
 (function() {
@@ -35,9 +36,10 @@
 			position : 'down', // down, up, left, leftup (upleft)
 			animation : 'slide',
 			elementId : false,
-			dataUrl : false
+			dataUrl : false,
+			win: window
 		};
-		var _opt, _orig, _h, _w, _canvas, _context, _img, _ready, _lastBadge, _running, _readyCb, _stop, _browser, _animTimeout, _drawTimeout;
+		var _opt, _orig, _h, _w, _canvas, _context, _img, _ready, _lastBadge, _running, _readyCb, _stop, _browser, _animTimeout, _drawTimeout, _doc;
 
 		_browser = {};
 		_browser.ff = typeof InstallTrigger != 'undefined';
@@ -62,6 +64,8 @@
 			_opt.position = _opt.position.toLowerCase();
 			_opt.animation = (animation.types['' + _opt.animation]) ? _opt.animation : _def.animation;
 
+			_doc = _opt.win.document;
+
 			var isUp = _opt.position.indexOf('up') > -1;
 			var isLeft = _opt.position.indexOf('left') > -1;
 
@@ -97,6 +101,7 @@
 			//create temp image
 			_img = document.createElement('img');
 			if (_orig.hasAttribute('href')) {
+				_img.setAttribute('crossOrigin', 'anonymous');
 				_img.setAttribute('src', _orig.getAttribute('href'));
 				//get width/height
 				_img.onload = function() {
@@ -320,14 +325,14 @@
 						});
 						_queue.push(q);
 						if (_queue.length > 100) {
-							throw 'Too many badges requests in queue.';
+							throw new Error('Too many badges requests in queue.');
 						}
 						icon.start();
 					} else {
 						icon.reset();
 					}
 				} catch(e) {
-					throw 'Error setting badge. Message: ' + e.message;
+					throw new Error('Error setting badge. Message: ' + e.message);
 				}
 			};
 			if (_ready) {
@@ -345,6 +350,7 @@
 					var h = imageElement.height;
 					var newImg = document.createElement('img');
 					var ratio = (w / _w < h / _h) ? (w / _w) : (h / _h);
+					newImg.setAttribute('crossOrigin', 'anonymous');
 					newImg.setAttribute('src', imageElement.getAttribute('src'));
 					newImg.height = (h / ratio);
 					newImg.width = (w / ratio);
@@ -352,7 +358,7 @@
 					_context.drawImage(newImg, 0, 0, _w, _h);
 					link.setIcon(_canvas);
 				} catch(e) {
-					throw 'Error setting image. Message: ' + e.message;
+					throw new Error('Error setting image. Message: ' + e.message);
 				}
 			};
 			if (_ready) {
@@ -379,7 +385,7 @@
 					}, false);
 
 				} catch(e) {
-					throw 'Error setting video. Message: ' + e.message;
+					throw new Error('Error setting video. Message: ' + e.message);
 				}
 			};
 			if (_ready) {
@@ -421,7 +427,7 @@
 						}, function() {
 						});
 					} catch(e) {
-						throw 'Error setting webcam. Message: ' + e.message;
+						throw new Error('Error setting webcam. Message: ' + e.message);
 					}
 				};
 				if (_ready) {
@@ -457,7 +463,7 @@
 			var elm = false;
 			//get link element
 			var getLink = function() {
-				var link = document.getElementsByTagName('head')[0].getElementsByTagName('link');
+				var link = _doc.getElementsByTagName('head')[0].getElementsByTagName('link');
 				for (var l = link.length, i = (l - 1); i >= 0; i--) {
 					if ((/(^|\s)icon(\s|$)/i).test(link[i].getAttribute('rel'))) {
 						return link[i];
@@ -469,15 +475,15 @@
 				elm = _opt.element;
 			} else if (_opt.elementId) {
 				//if img element identified by elementId
-				elm = document.getElementById(_opt.elementId);
+				elm = _doc.getElementById(_opt.elementId);
 				elm.setAttribute('href', elm.getAttribute('src'));
 			} else {
 				//if link element
 				elm = getLink();
 				if (elm === false) {
-					elm = document.createElement('link');
+					elm = _doc.createElement('link');
 					elm.setAttribute('rel', 'icon');
-					document.getElementsByTagName('head')[0].appendChild(elm);
+					_doc.getElementsByTagName('head')[0].appendChild(elm);
 				}
 			}
 			elm.setAttribute('type', 'image/png');
@@ -490,24 +496,27 @@
 				_opt.dataUrl(url);
 			}
 			if (_opt.element) {
+				_opt.element.setAttribute('href', url);
 				_opt.element.setAttribute('src', url);
 			} else if (_opt.elementId) {
 				//if is attached to element (image)
-				document.getElementById(_opt.elementId).setAttribute('src', url);
+				var elm = _doc.getElementById(_opt.elementId);
+				elm.setAttribute('href', url);
+				elm.setAttribute('src', url);
 			} else {
 				//if is attached to fav icon
 				if (_browser.ff || _browser.opera) {
 					//for FF we need to "recreate" element, atach to dom and remove old <link>
 					//var originalType = _orig.getAttribute('rel');
 					var old = _orig;
-					_orig = document.createElement('link');
+					_orig = _doc.createElement('link');
 					//_orig.setAttribute('rel', originalType);
 					if (_browser.opera) {
 						_orig.setAttribute('rel', 'icon');
 					}
 					_orig.setAttribute('rel', 'icon');
 					_orig.setAttribute('type', 'image/png');
-					document.getElementsByTagName('head')[0].appendChild(_orig);
+					_doc.getElementsByTagName('head')[0].appendChild(_orig);
 					_orig.setAttribute('href', url);
 					if (old.parentNode) {
 						old.parentNode.removeChild(old);
@@ -553,7 +562,7 @@
 		 * http://stackoverflow.com/questions/12536562/detect-whether-a-window-is-visible
 		 */
 		function isPageHidden() {
-			return document.hidden || document.msHidden || document.webkitHidden || document.mozHidden;
+			return _doc.hidden || _doc.msHidden || _doc.webkitHidden || _doc.mozHidden;
 		}
 
 		/**
@@ -840,4 +849,3 @@
 	}
 
 })();
-

doc/global.html

@@ -344,7 +344,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/index.html

@@ -54,7 +54,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.gui.dialog.html

@@ -547,7 +547,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.gui.html

@@ -2440,7 +2440,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line852">line 852</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line855">line 855</a>
     </li></ul></dd>
     
     
@@ -3404,7 +3404,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.gui.queryActions.html

@@ -464,7 +464,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.gui.roster.html

@@ -1533,7 +1533,7 @@ alphabetical of the name
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.gui.window.html

@@ -2529,7 +2529,7 @@ created.
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.html

@@ -4443,7 +4443,7 @@ normal signal
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.lib.gui.js.html

@@ -1467,7 +1467,7 @@ jsxc.gui.roster = {
       });
 
       $('#jsxc_roster .jsxc_onlineHelp').click(function() {
-         window.open("http://www.jsxc.org/manual.html", "onlineHelp");
+         window.open(jsxc.options.onlineHelp, 'onlineHelp');
       });
 
       $('#jsxc_roster .jsxc_about').click(function() {
@@ -2531,7 +2531,7 @@ jsxc.gui.template.get = function(name, bid, msg) {
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:26 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.lib.js.html

@@ -656,7 +656,7 @@ jsxc = {
     * @returns comparable bar jid
     */
    jidToBid: function(jid) {
-      return Strophe.getBareJidFromJid(jid).toLowerCase();
+      return Strophe.unescapeNode(Strophe.getBareJidFromJid(jid).toLowerCase());
    },
 
    /**
@@ -880,7 +880,7 @@ jsxc = {
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:26 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.lib.muc.js.html

@@ -1516,7 +1516,7 @@ $(document).one('connected.jsxc', function() {
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:26 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.lib.notice.js.html

@@ -157,7 +157,7 @@ jsxc.notice = {
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:26 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.lib.notification.js.html

@@ -315,7 +315,7 @@ jsxc.notification = {
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:26 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.lib.options.js.html

@@ -254,7 +254,10 @@ jsxc.options = {
       iceServers: [{
          urls: 'stun:stun.stunprotocol.org'
       }]
-   }
+   },
+
+   /** Link to an online user manual */
+   onlineHelp: 'http://www.jsxc.org/manual.html'
 };
 </code></pre>
         </article>
@@ -272,7 +275,7 @@ jsxc.options = {
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:26 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.lib.otr.js.html

@@ -527,7 +527,7 @@ jsxc.otr = {
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:26 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.lib.storage.js.html

@@ -77,7 +77,12 @@ jsxc.storage = {
       }
 
       if (typeof(value) === 'object') {
-         value = JSON.stringify(value);
+         // exclude jquery objects, because otherwise safari will fail
+         value = JSON.stringify(value, function(key, val) {
+            if (!(val instanceof jQuery)) {
+               return val;
+            }
+         });
       }
 
       localStorage.setItem(jsxc.storage.getPrefix(uk) + key, value);
@@ -665,7 +670,7 @@ jsxc.storage = {
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:26 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.lib.webrtc.js.html

@@ -500,6 +500,9 @@ jsxc.webrtc = {
     */
    onMediaFailure: function(ev, err) {
       var self = jsxc.webrtc;
+      err = err || {
+         name: 'Undefined'
+      };
 
       self.setStatus('media failure');
 
@@ -1031,7 +1034,7 @@ $(document).ready(function() {
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:26 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.lib.xmpp.bookmarks.js.html

@@ -383,7 +383,7 @@ jsxc.xmpp.bookmarks.showDialog = function(room) {
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:26 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.lib.xmpp.js.html

@@ -1188,7 +1188,7 @@ jsxc.xmpp.carbons = {
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:43 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:26 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.muc.html

@@ -3353,7 +3353,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.notification.html

@@ -1256,7 +1256,7 @@ messages.
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.options.html

@@ -737,6 +737,60 @@
     
     
     
+</dl>
+
+    
+    
+</dd>
+
+        
+            
+<dt>
+    <h4 class="name" id="onlineHelp"><span class="type-signature">&lt;static> </span>onlineHelp<span class="type-signature"></span></h4>
+    
+    
+</dt>
+<dd>
+    
+    <div class="description">
+        Link to an online user manual
+    </div>
+    
+    
+    
+
+    
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.options.js.html">jsxc.lib.options.js</a>, <a href="jsxc.lib.options.js.html#line233">line 233</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
 </dl>
 
     
@@ -2144,7 +2198,7 @@ connection is found.
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.otr.html

@@ -2024,7 +2024,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.storage.html

@@ -270,7 +270,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line80">line 80</a>
+        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line85">line 85</a>
     </li></ul></dd>
     
     
@@ -517,7 +517,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line97">line 97</a>
+        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line102">line 102</a>
     </li></ul></dd>
     
     
@@ -667,7 +667,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line209">line 209</a>
+        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line214">line 214</a>
     </li></ul></dd>
     
     
@@ -901,7 +901,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line259">line 259</a>
+        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line264">line 264</a>
     </li></ul></dd>
     
     
@@ -1064,7 +1064,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line222">line 222</a>
+        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line227">line 227</a>
     </li></ul></dd>
     
     
@@ -1222,7 +1222,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line116">line 116</a>
+        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line121">line 121</a>
     </li></ul></dd>
     
     
@@ -1334,7 +1334,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line134">line 134</a>
+        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line139">line 139</a>
     </li></ul></dd>
     
     
@@ -1464,7 +1464,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line601">line 601</a>
+        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line606">line 606</a>
     </li></ul></dd>
     
     
@@ -1688,7 +1688,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line567">line 567</a>
+        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line572">line 572</a>
     </li></ul></dd>
     
     
@@ -2087,7 +2087,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line156">line 156</a>
+        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line161">line 161</a>
     </li></ul></dd>
     
     
@@ -2282,7 +2282,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line188">line 188</a>
+        <a href="jsxc.lib.storage.js.html">jsxc.lib.storage.js</a>, <a href="jsxc.lib.storage.js.html#line193">line 193</a>
     </li></ul></dd>
     
     
@@ -2329,7 +2329,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.webrtc.html

@@ -597,7 +597,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line630">line 630</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line633">line 633</a>
     </li></ul></dd>
     
     
@@ -925,7 +925,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line734">line 734</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line737">line 737</a>
     </li></ul></dd>
     
     
@@ -1420,7 +1420,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line491">line 491</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line494">line 494</a>
     </li></ul></dd>
     
     
@@ -1489,7 +1489,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line592">line 592</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line595">line 595</a>
     </li></ul></dd>
     
     
@@ -1691,7 +1691,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line557">line 557</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line560">line 560</a>
     </li></ul></dd>
     
     
@@ -1969,7 +1969,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line660">line 660</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line663">line 663</a>
     </li></ul></dd>
     
     
@@ -2576,7 +2576,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line605">line 605</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line608">line 608</a>
     </li></ul></dd>
     
     
@@ -2724,7 +2724,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line645">line 645</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line648">line 648</a>
     </li></ul></dd>
     
     
@@ -2793,7 +2793,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line746">line 746</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line749">line 749</a>
     </li></ul></dd>
     
     
@@ -3035,7 +3035,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line811">line 811</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line814">line 814</a>
     </li></ul></dd>
     
     
@@ -3165,7 +3165,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line690">line 690</a>
+        <a href="jsxc.lib.webrtc.js.html">jsxc.lib.webrtc.js</a>, <a href="jsxc.lib.webrtc.js.html#line693">line 693</a>
     </li></ul></dd>
     
     
@@ -3324,7 +3324,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.xmpp.bookmarks.html

@@ -1787,7 +1787,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.xmpp.carbons.html

@@ -455,7 +455,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/jsxc.xmpp.html

@@ -2572,7 +2572,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Jul 31 2015 11:10:44 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 10 2015 13:33:27 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsxc",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Real-time chat app",
   "homepage": "http://www.jsxc.org/",
   "bugs": "https://github.com/jsxc/jsxc/issues",

scss/_dep.scss

@@ -16,6 +16,10 @@
 }
 
 
+#jsxc_dialog {
+    @import "../lib/bootstrap/assets/stylesheets/bootstrap/progress-bars";
+}
+
 #jsxc_dialog {
     @import "../lib/bootstrap/assets/stylesheets/bootstrap/utilities";
     @import "../lib/bootstrap/assets/stylesheets/bootstrap/code";
@@ -24,7 +28,6 @@
     @import "../lib/bootstrap/assets/stylesheets/bootstrap/buttons";
     @import "../lib/bootstrap/assets/stylesheets/bootstrap/button-groups";
     @import "../lib/bootstrap/assets/stylesheets/bootstrap/forms";
-    @import "../lib/bootstrap/assets/stylesheets/bootstrap/progress-bars";
     .progress {
         margin-bottom: 0px;
     }

src/jsxc.lib.gui.js

@@ -1440,7 +1440,7 @@ jsxc.gui.roster = {
       });
 
       $('#jsxc_roster .jsxc_onlineHelp').click(function() {
-         window.open("http://www.jsxc.org/manual.html", "onlineHelp");
+         window.open(jsxc.options.onlineHelp, 'onlineHelp');
       });
 
       $('#jsxc_roster .jsxc_about').click(function() {

src/jsxc.lib.js

@@ -629,7 +629,7 @@ jsxc = {
     * @returns comparable bar jid
     */
    jidToBid: function(jid) {
-      return Strophe.getBareJidFromJid(jid).toLowerCase();
+      return Strophe.unescapeNode(Strophe.getBareJidFromJid(jid).toLowerCase());
    },
 
    /**

src/jsxc.lib.options.js

@@ -227,5 +227,8 @@ jsxc.options = {
       iceServers: [{
          urls: 'stun:stun.stunprotocol.org'
       }]
-   }
+   },
+
+   /** Link to an online user manual */
+   onlineHelp: 'http://www.jsxc.org/manual.html'
 };

src/jsxc.lib.storage.js

@@ -50,7 +50,12 @@ jsxc.storage = {
       }
 
       if (typeof(value) === 'object') {
-         value = JSON.stringify(value);
+         // exclude jquery objects, because otherwise safari will fail
+         value = JSON.stringify(value, function(key, val) {
+            if (!(val instanceof jQuery)) {
+               return val;
+            }
+         });
       }
 
       localStorage.setItem(jsxc.storage.getPrefix(uk) + key, value);

src/jsxc.lib.webrtc.js

@@ -473,6 +473,9 @@ jsxc.webrtc = {
     */
    onMediaFailure: function(ev, err) {
       var self = jsxc.webrtc;
+      err = err || {
+         name: 'Undefined'
+      };
 
       self.setStatus('media failure');
 

template/aboutDialog.html

@@ -15,7 +15,7 @@
 </p>
 <p class="jsxc_libraries">
    <b>Libraries: </b>
-   < $ dep.libraries $>
+   <$ dep.libraries $>
 </p>
 
 <button class="btn btn-default pull-right jsxc_debuglog">Show debug log</button>