Merge branch 'private-jquery'

converse.js

@@ -15,9 +15,9 @@
                 var otr = dependencies.otr,
                     moment = dependencies.moment;
                 if (typeof otr !== "undefined") {
-                    return factory(jQuery, _, otr.OTR, otr.DSA, templates, moment);
+                    return factory(dependencies.jQuery, _, otr.OTR, otr.DSA, templates, moment);
                 } else {
-                    return factory(jQuery, _, undefined, undefined, templates, moment);
+                    return factory(dependencies.jQuery, _, undefined, undefined, templates, moment);
                 }
             }
         );
@@ -4576,7 +4576,7 @@
                         rid += 1;
                         this.session.save({rid: rid}); // The RID needs to be increased with each request.
                         this.connection.attach(jid, sid, rid, this.onConnect);
-                    } else if (prebind) {
+                    } else if (this.prebind) {
                         delete this.connection;
                         this.emit('noResumeableSession');
                     }
@@ -4656,6 +4656,7 @@
         },
         'off': function(evt, handler) {
             converse.off(evt, handler);
-        }
+        },
+        'jQuery': $
     };
 }));

main.js

@@ -9,6 +9,7 @@ config = {
         "converse-templates":       "src/templates",
         "eventemitter":             "components/otr/build/dep/eventemitter",
         "jquery":                   "components/jquery/dist/jquery",
+        "jquery-private":           "src/jquery-private",
         "jquery.browser":           "components/jquery.browser/dist/jquery.browser",
         "jquery.easing":            "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website
         "moment":                   "components/momentjs/moment",
@@ -115,17 +116,6 @@ config = {
 
     // define module dependencies for modules not using define
     shim: {
-        'backbone': {
-            //These script dependencies should be loaded before loading
-            //backbone.js
-            deps: [
-                'underscore',
-                'jquery'
-                ],
-            //Once loaded, use the global 'Backbone' as the
-            //module value.
-            exports: 'Backbone'
-        },
         'underscore':           { exports: '_' },
         'bootstrap':            { deps: ['jquery'] },
         'crypto.aes':           { deps: ['crypto.cipher-core'] },
@@ -142,10 +132,8 @@ config = {
         'typeahead':            { deps: ['jquery'] },
         'jquery.browser':       { deps: ['jquery'] },
         'jquery.easing':        { deps: ['jquery'] },
-        'utils':                { deps: ['jquery'] },
-        'strophe':              { deps: ['jquery'] },
         'strophe.disco':        { deps: ['strophe'] },
-        'strophe.muc':          { deps: ['strophe', 'jquery'] },
+        'strophe.muc':          { deps: ['strophe'] },
         'strophe.roster':       { deps: ['strophe'] },
         'strophe.vcard':        { deps: ['strophe'] }
     }

src/deps-full.js

 define("converse-dependencies", [
+    "jquery",
     "otr",
     "moment",
     "locales",
@@ -12,8 +13,9 @@ define("converse-dependencies", [
     "strophe.roster",
     "strophe.vcard",
     "strophe.disco"
-], function(otr, moment) {
+], function($, otr, moment) {
     return {
+        'jQuery': $,
         'otr': otr,
         'moment': moment
     };

src/deps-no-otr.js

 define("converse-dependencies", [
+    "jquery",
     "moment",
     "locales",
     "backbone.browserStorage",
@@ -11,8 +12,9 @@ define("converse-dependencies", [
     "strophe.roster",
     "strophe.vcard",
     "strophe.disco"
-], function(moment) {
+], function($, moment) {
     return {
+        'jQuery': $,
         'otr': undefined,
         'moment': moment
     };

src/deps-website-no-otr.js

 define("converse-dependencies", [
+    "jquery",
     "moment",
     "locales",
     "bootstrap", // XXX: Can be removed, only for https://conversejs.org
@@ -13,8 +14,9 @@ define("converse-dependencies", [
     "strophe.roster",
     "strophe.vcard",
     "strophe.disco"
-], function(moment) {
+], function($, moment) {
     return {
+        'jQuery': $,
         'otr': undefined,
         'moment': moment
     };

src/deps-website.js

 define("converse-dependencies", [
+    "jquery",
     "otr",
     "moment",
     "locales",
@@ -14,8 +15,9 @@ define("converse-dependencies", [
     "strophe.roster",
     "strophe.vcard",
     "strophe.disco"
-], function(otr, moment) {
+], function($, otr, moment) {
     return {
+        'jQuery': $,
         'otr': otr,
         'moment': moment
     };

src/jquery-private.js

+define(['jquery'], function (jq) {
+    return jq.noConflict( true );
+});

src/otr.js

@@ -13,10 +13,11 @@
 
   if (typeof define === 'function' && define.amd) {
     define([
-        "bigint"
-      , "crypto"
-      , "eventemitter"
-    ], function (BigInt, CryptoJS, EventEmitter) {
+        "jquery",
+        "bigint",
+        "crypto",
+        "eventemitter"
+    ], function ($, BigInt, CryptoJS, EventEmitter) {
       if ($.browser.msie) {
           return undefined;
       }

src/utils.js

-jQuery.fn.hasScrollBar = function() {
-    if (!$.contains(document, this.get(0))) {
+define(["jquery"], function ($) {
+    $.fn.hasScrollBar = function() {
+        if (!$.contains(document, this.get(0))) {
+            return false;
+        }
+        if(this.parent().height() < this.get(0).scrollHeight) {
+            return true;
+        }
         return false;
-    }
-    if(this.parent().height() < this.get(0).scrollHeight) {
-        return true;
-    }
-    return false;
-};
-
+    };
+});