|
@@ -428,9 +428,8 @@ var requirejs, require, define;
|
|
|
define("components/almond/almond.js", function(){});
|
|
|
|
|
|
/**
|
|
|
- * @license RequireJS text 2.0.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
|
|
|
- * Available via the MIT or new BSD license.
|
|
|
- * see: http://github.com/requirejs/text for details
|
|
|
+ * @license text 2.0.15 Copyright jQuery Foundation and other contributors.
|
|
|
+ * Released under MIT license, http://github.com/requirejs/text/LICENSE
|
|
|
*/
|
|
|
/*jslint regexp: true */
|
|
|
/*global require, XMLHttpRequest, ActiveXObject,
|
|
@@ -451,8 +450,26 @@ define('text',['module'], function (module) {
|
|
|
buildMap = {},
|
|
|
masterConfig = (module.config && module.config()) || {};
|
|
|
|
|
|
+ function useDefault(value, defaultValue) {
|
|
|
+ return value === undefined || value === '' ? defaultValue : value;
|
|
|
+ }
|
|
|
+
|
|
|
+ //Allow for default ports for http and https.
|
|
|
+ function isSamePort(protocol1, port1, protocol2, port2) {
|
|
|
+ if (port1 === port2) {
|
|
|
+ return true;
|
|
|
+ } else if (protocol1 === protocol2) {
|
|
|
+ if (protocol1 === 'http') {
|
|
|
+ return useDefault(port1, '80') === useDefault(port2, '80');
|
|
|
+ } else if (protocol1 === 'https') {
|
|
|
+ return useDefault(port1, '443') === useDefault(port2, '443');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
text = {
|
|
|
- version: '2.0.14',
|
|
|
+ version: '2.0.15',
|
|
|
|
|
|
strip: function (content) {
|
|
|
//Strips <?xml ...?> declarations so that external SVG and XML
|
|
@@ -570,7 +587,7 @@ define('text',['module'], function (module) {
|
|
|
|
|
|
return (!uProtocol || uProtocol === protocol) &&
|
|
|
(!uHostName || uHostName.toLowerCase() === hostname.toLowerCase()) &&
|
|
|
- ((!uPort && !uHostName) || uPort === port);
|
|
|
+ ((!uPort && !uHostName) || isSamePort(uProtocol, uPort, protocol, port));
|
|
|
},
|
|
|
|
|
|
finishLoad: function (name, strip, content, onLoad) {
|
|
@@ -6627,7 +6644,8 @@ define('text!ca',[],function () { return '{\n "domain": "converse",\n "local
|
|
|
* fetching the roster we are ready to receive presence
|
|
|
* updates from our contacts.
|
|
|
*/
|
|
|
- converse.roster.fetchFromServer(converse.xmppstatus.sendPresence);
|
|
|
+ converse.roster.fetchFromServer(
|
|
|
+ converse.xmppstatus.sendPresence.bind(converse.xmppstatus));
|
|
|
} else if (converse.send_initial_presence) {
|
|
|
/* We're not going to fetch the roster again because we have
|
|
|
* it already cached in sessionStorage, but we still need to
|