Commit bf6474ff authored by JC Brand's avatar JC Brand

Upgrade jquery to 1.11.0 and add jquery.browser

parent 7d472eb2
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
}, },
"dependencies": { "dependencies": {
"requirejs": "2.1.11", "requirejs": "2.1.11",
"jquery": "1.8.3", "jquery": "1.11.0",
"jed": "0.5.4", "jed": "0.5.4",
"tinysort": "git://github.com/Sjeiti/TinySort.git", "tinysort": "git://github.com/Sjeiti/TinySort.git",
"underscore": "1.5.1", "underscore": "1.5.1",
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
"almond": "~0.2.6", "almond": "~0.2.6",
"requirejs-text": "~2.0.10", "requirejs-text": "~2.0.10",
"requirejs-tpl-jcbrand": "*", "requirejs-tpl-jcbrand": "*",
"momentjs": "~2.6.0" "momentjs": "~2.6.0",
"jquery.browser": "~0.0.6"
}, },
"exportsOverride": {} "exportsOverride": {}
} }
config = { config = {
paths: { paths: {
"jquery": "components/jquery/jquery", "jquery": "components/jquery/dist/jquery",
"jquery.tinysort": "components/tinysort/src/jquery.tinysort", "jquery.tinysort": "components/tinysort/src/jquery.tinysort",
"jquery.browser": "components/jquery.browser/dist/jquery.browser",
"locales": "locale/locales", "locales": "locale/locales",
"underscore": "components/underscore/underscore", "underscore": "components/underscore/underscore",
"backbone": "components/backbone/backbone", "backbone": "components/backbone/backbone",
......
...@@ -628,8 +628,8 @@ ...@@ -628,8 +628,8 @@
it("is cleared when the window is focused", $.proxy(function () { it("is cleared when the window is focused", $.proxy(function () {
spyOn(converse, 'clearMsgCounter').andCallThrough(); spyOn(converse, 'clearMsgCounter').andCallThrough();
runs(function () { runs(function () {
$(window).trigger('blur'); $(window).triggerHandler('blur');
$(window).trigger('focus'); $(window).triggerHandler('focus');
}); });
waits(50); waits(50);
runs(function () { runs(function () {
......
...@@ -4,6 +4,7 @@ define("converse-dependencies", [ ...@@ -4,6 +4,7 @@ define("converse-dependencies", [
"locales", "locales",
"backbone.localStorage", "backbone.localStorage",
"jquery.tinysort", "jquery.tinysort",
"jquery.browser",
"strophe", "strophe",
"strophe.muc", "strophe.muc",
"strophe.roster", "strophe.roster",
......
...@@ -3,6 +3,7 @@ define("converse-dependencies", [ ...@@ -3,6 +3,7 @@ define("converse-dependencies", [
"locales", "locales",
"backbone.localStorage", "backbone.localStorage",
"jquery.tinysort", "jquery.tinysort",
"jquery.browser",
"strophe", "strophe",
"strophe.muc", "strophe.muc",
"strophe.roster", "strophe.roster",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment