Quellcode durchsuchen

Upgrade jquery to 1.11.0 and add jquery.browser

JC Brand vor 11 Jahren
Ursprung
Commit
bf6474ff6d
5 geänderte Dateien mit 9 neuen und 5 gelöschten Zeilen
  1. 3 2
      bower.json
  2. 2 1
      main.js
  3. 2 2
      spec/chatbox.js
  4. 1 0
      src/deps-full.js
  5. 1 0
      src/deps-no-otr.js

+ 3 - 2
bower.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "requirejs": "2.1.11",
-    "jquery": "1.8.3",
+    "jquery": "1.11.0",
     "jed": "0.5.4",
     "tinysort": "git://github.com/Sjeiti/TinySort.git",
     "underscore": "1.5.1",
@@ -25,7 +25,8 @@
     "almond": "~0.2.6",
     "requirejs-text": "~2.0.10",
     "requirejs-tpl-jcbrand": "*",
-    "momentjs": "~2.6.0"
+    "momentjs": "~2.6.0",
+    "jquery.browser": "~0.0.6"
   },
   "exportsOverride": {}
 }

+ 2 - 1
main.js

@@ -1,7 +1,8 @@
 config = {
     paths: {
-        "jquery": "components/jquery/jquery",
+        "jquery": "components/jquery/dist/jquery",
         "jquery.tinysort": "components/tinysort/src/jquery.tinysort",
+        "jquery.browser": "components/jquery.browser/dist/jquery.browser",
         "locales": "locale/locales",
         "underscore": "components/underscore/underscore",
         "backbone": "components/backbone/backbone",

+ 2 - 2
spec/chatbox.js

@@ -628,8 +628,8 @@
             it("is cleared when the window is focused", $.proxy(function () {
                 spyOn(converse, 'clearMsgCounter').andCallThrough();
                 runs(function () {
-                    $(window).trigger('blur');
-                    $(window).trigger('focus');
+                    $(window).triggerHandler('blur');
+                    $(window).triggerHandler('focus');
                 });
                 waits(50);
                 runs(function () {

+ 1 - 0
src/deps-full.js

@@ -4,6 +4,7 @@ define("converse-dependencies", [
     "locales",
     "backbone.localStorage",
     "jquery.tinysort",
+    "jquery.browser",
     "strophe",
     "strophe.muc",
     "strophe.roster",

+ 1 - 0
src/deps-no-otr.js

@@ -3,6 +3,7 @@ define("converse-dependencies", [
     "locales",
     "backbone.localStorage",
     "jquery.tinysort",
+    "jquery.browser",
     "strophe",
     "strophe.muc",
     "strophe.roster",