Skip to content

Commit

Permalink
[third] Upgrade jquery to version 1.8.3.
Browse files Browse the repository at this point in the history
Also use the modern NPM name of 'jquery' (all lower case), which is
required as part of this migration.

Fixes zulip#1141.
  • Loading branch information
timabbott committed Jul 8, 2016
1 parent cb18ef0 commit be93b6e
Show file tree
Hide file tree
Showing 8 changed files with 3,626 additions and 3,558 deletions.
2 changes: 1 addition & 1 deletion frontend_tests/node_tests/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ i18n.init({
}
});

global.$ = require('jQuery');
global.$ = require('jquery');
var _ = global._;

// When writing these tests, the following command might be helpful:
Expand Down
2 changes: 1 addition & 1 deletion frontend_tests/node_tests/message_list_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _ = require('third/underscore/underscore.js');
var MessageListView = require('js/message_list_view.js');

add_dependencies({
$: 'jQuery',
$: 'jquery',
XDate: 'third/xdate/xdate.dev.js',
util: 'js/util.js'
});
Expand Down
2 changes: 1 addition & 1 deletion frontend_tests/node_tests/presence_list_performance.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ compose_fade.update_faded_users = function () {
return;
};

global.$ = require('jQuery');
global.$ = require('jquery');
$.fn.expectOne = function () {
assert(this.length === 1);
return this;
Expand Down
2 changes: 1 addition & 1 deletion frontend_tests/node_tests/stream_list.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set_global('message_store', {

var stream_list = require('js/stream_list.js');

global.$ = require('jQuery');
global.$ = require('jquery');
$.fn.expectOne = function () {
assert(this.length === 1);
return this;
Expand Down
2 changes: 1 addition & 1 deletion frontend_tests/node_tests/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ i18n.init({
lng: 'en'
});

global.$ = require('jQuery');
global.$ = require('jquery');
var _ = global._;

// When writing these tests, the following command might be helpful:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"devDependencies": {
"handlebars": "1.3.0",
"istanbul": "0.4.0",
"jQuery": "1.7.4",
"jquery": "1.8.3",
"jsdom": "0.5.7",
"xmlhttprequest": "1.5.0",
"nwmatcher": "1.3.6",
Expand Down
Loading

0 comments on commit be93b6e

Please sign in to comment.