paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 10:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[third] Upgrade jquery to version 1.8.3.

Browse Source 
Also use the modern NPM name of 'jquery' (all lower case), which is
required as part of this migration.

Fixes #1141.
This commit is contained in:
Tim Abbott
2016-07-08 10:29:30 -07:00
parent cb18ef07a7
commit be93b6ea28
8 changed files with 3758 additions and 3690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/i18n.js
View File

@@ -23,7 +23,7 @@ i18n.init({
} }
}); });
global.$ = require('jQuery'); global.$ = require('jquery');
var _ = global._; var _ = global._;
// When writing these tests, the following command might be helpful: // When writing these tests, the following command might be helpful:

2
frontend_tests/node_tests/message_list_view.js
View File

@@ -2,7 +2,7 @@ var _ = require('third/underscore/underscore.js');
var MessageListView = require('js/message_list_view.js'); var MessageListView = require('js/message_list_view.js');
add_dependencies({ add_dependencies({
$: 'jQuery', $: 'jquery',
XDate: 'third/xdate/xdate.dev.js', XDate: 'third/xdate/xdate.dev.js',
util: 'js/util.js' util: 'js/util.js'
}); });

2
frontend_tests/node_tests/presence_list_performance.js
View File

@@ -25,7 +25,7 @@ compose_fade.update_faded_users = function () {
return; return;
}; };
global.$ = require('jQuery'); global.$ = require('jquery');
$.fn.expectOne = function () { $.fn.expectOne = function () {
assert(this.length === 1); assert(this.length === 1);
return this; return this;

2
frontend_tests/node_tests/stream_list.js
View File

@@ -20,7 +20,7 @@ set_global('message_store', {
var stream_list = require('js/stream_list.js'); var stream_list = require('js/stream_list.js');
global.$ = require('jQuery'); global.$ = require('jquery');
$.fn.expectOne = function () { $.fn.expectOne = function () {
assert(this.length === 1); assert(this.length === 1);
return this; return this;

2
frontend_tests/node_tests/templates.js
View File

@@ -15,7 +15,7 @@ i18n.init({
lng: 'en' lng: 'en'
}); });
global.$ = require('jQuery'); global.$ = require('jquery');
var _ = global._; var _ = global._;
// When writing these tests, the following command might be helpful: // When writing these tests, the following command might be helpful:

2
package.json
View File

@@ -8,7 +8,7 @@
"devDependencies": { "devDependencies": {
"handlebars": "1.3.0", "handlebars": "1.3.0",
"istanbul": "0.4.0", "istanbul": "0.4.0",
"jQuery": "1.7.4", "jquery": "1.8.3",
"jsdom": "0.5.7", "jsdom": "0.5.7",
"xmlhttprequest": "1.5.0", "xmlhttprequest": "1.5.0",
"nwmatcher": "1.3.6", "nwmatcher": "1.3.6",

6972
static/third/jquery/jquery-1.7.2.js → static/third/jquery/jquery-1.8.3.js vendored
View File

File diff suppressed because it is too large Load Diff

2
zproject/settings.py
View File

@@ -618,7 +618,7 @@ PIPELINE_CSS = {
JS_SPECS = { JS_SPECS = {
'common': { 'common': {
'source_filenames': ( 'source_filenames': (
'third/jquery/jquery-1.7.2.js', 'third/jquery/jquery-1.8.3.js',
'third/underscore/underscore.js', 'third/underscore/underscore.js',
'js/blueslip.js', 'js/blueslip.js',
'third/bootstrap/js/bootstrap.js', 'third/bootstrap/js/bootstrap.js',