Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274845
Change subject: build: Bump various devDependencies
......................................................................
build: Bump various devDependencies
grunt-contrib-jshint: 0.11.0 -> 0.11.2
grunt-jscs: 1.5.0 -> 1.8.0
karma-chrome-launcher: 0.1.7 -> 0.1.8
qunitjs: 1.17.1 -> 1.18.0
Some trivial indentation and line-spacing changes to make this pass jscs.
Change-Id: Ieeb6dbcd3e6d9f6f0fb9865d356da462b9b0499b
(cherry picked from commit 5f7c6c5805db9bdfcac40888dd2a3667d2a3f67c)
---
M package.json
M resources/src/jquery/jquery.tablesorter.js
M resources/src/mediawiki.api/mediawiki.api.js
M tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
M tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
5 files changed, 13 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/45/274845/1
diff --git a/package.json b/package.json
index fc2bd3a..42270f7 100644
--- a/package.json
+++ b/package.json
@@ -11,15 +11,15 @@
"grunt-cli": "0.1.13",
"grunt-banana-checker": "0.2.1",
"grunt-contrib-copy": "0.8.0",
- "grunt-contrib-jshint": "0.11.0",
+ "grunt-contrib-jshint": "0.11.2",
"grunt-contrib-watch": "0.6.1",
- "grunt-jscs": "1.5.0",
+ "grunt-jscs": "1.8.0",
"grunt-jsonlint": "1.0.4",
"grunt-karma": "0.10.1",
"karma": "0.12.31",
- "karma-chrome-launcher": "0.1.7",
+ "karma-chrome-launcher": "0.1.8",
"karma-firefox-launcher": "0.1.4",
"karma-qunit": "0.1.4",
- "qunitjs": "1.17.1"
+ "qunitjs": "1.18.0"
}
}
diff --git a/resources/src/jquery/jquery.tablesorter.js
b/resources/src/jquery/jquery.tablesorter.js
index ff5ff0a..94fdca5 100644
--- a/resources/src/jquery/jquery.tablesorter.js
+++ b/resources/src/jquery/jquery.tablesorter.js
@@ -708,7 +708,6 @@
/* Public scope */
$.tablesorter = {
-
defaultOptions: {
cssHeader: 'headerSort',
cssAsc: 'headerSortUp',
diff --git a/resources/src/mediawiki.api/mediawiki.api.js
b/resources/src/mediawiki.api/mediawiki.api.js
index 3a19e02..08996fe 100644
--- a/resources/src/mediawiki.api/mediawiki.api.js
+++ b/resources/src/mediawiki.api/mediawiki.api.js
@@ -5,7 +5,6 @@
// wondering, would it be simpler to make it easy to clone the api
object,
// change error handling, and use that instead?
var defaultOptions = {
-
// Query parameters for API requests
parameters: {
action: 'query',
@@ -21,6 +20,7 @@
dataType: 'json'
}
},
+
// Keyed by ajax url and symbolic name for the individual
request
promises = {};
diff --git a/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
b/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
index 56b0fa9..4bf44b0 100644
--- a/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
@@ -244,16 +244,15 @@
caretSample = 'Some big text that we like to work with. Nothing
fancy... you know what I mean?';
-/*
- // @broken: Disabled per bug 34820
+ /* @broken: Disabled per bug 34820
caretTest({
- description: 'getCaretPosition with original/empty selection - bug
31847 with IE 6/7/8',
- text: caretSample,
- start: [0, caretSample.length], // Opera and Firefox (prior to FF 6.0)
default caret to the end of the box (caretSample.length)
- end: [0, caretSample.length], // Other browsers default it to the
beginning (0), so check both.
- mode: 'get'
+ description: 'getCaretPosition with original/empty selection -
bug 31847 with IE 6/7/8',
+ text: caretSample,
+ start: [0, caretSample.length], // Opera and Firefox (prior to
FF 6.0) default caret to the end of the box (caretSample.length)
+ end: [0, caretSample.length], // Other browsers default it to
the beginning (0), so check both.
+ mode: 'get'
});
-*/
+ */
caretTest( {
description: 'set/getCaretPosition with forced empty selection',
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
index 7e23e2f..9dde167 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@ -386,7 +386,7 @@
);
} );
-// Tests that {{-transformation vs. general parsing are done as requested
+ // Tests that {{-transformation vs. general parsing are done as
requested
QUnit.test( 'Curly brace transformation', 16, function ( assert ) {
var oldUserLang = mw.config.get( 'wgUserLanguage' );
--
To view, visit https://gerrit.wikimedia.org/r/274845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieeb6dbcd3e6d9f6f0fb9865d356da462b9b0499b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
