Upgrade jquery to 1.11.0 and add jquery.browser
This commit is contained in:
parent
7d472eb26d
commit
bf6474ff6d
|
@ -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": {}
|
||||
}
|
||||
|
|
3
main.js
3
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",
|
||||
|
|
|
@ -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 () {
|
||||
|
|
|
@ -4,6 +4,7 @@ define("converse-dependencies", [
|
|||
"locales",
|
||||
"backbone.localStorage",
|
||||
"jquery.tinysort",
|
||||
"jquery.browser",
|
||||
"strophe",
|
||||
"strophe.muc",
|
||||
"strophe.roster",
|
||||
|
|
|
@ -3,6 +3,7 @@ define("converse-dependencies", [
|
|||
"locales",
|
||||
"backbone.localStorage",
|
||||
"jquery.tinysort",
|
||||
"jquery.browser",
|
||||
"strophe",
|
||||
"strophe.muc",
|
||||
"strophe.roster",
|
||||
|
|
Loading…
Reference in New Issue
Block a user