jenkins-bot has submitted this change and it was merged.
Change subject: build: Bump devDependencies to latest and make pass
......................................................................
build: Bump devDependencies to latest and make pass
grunt-exec 0.4.7 → 1.0.0
grunt-image 1.5.1 → 1.5.2
grunt-jscs 2.8.0 → 3.0.1
grunt-jsonlint 1.0.7 → 1.1.0
grunt-karma 1.0.0 → 2.0.0
grunt-stylelint 0.3.0 → 0.4.0
grunt-jsonlint 1.0.8 → 1.1.0
karma 0.13.22 → 1.1.0
karma-qunit 1.0.0 → 1.1.0
stylelint-config-wikimedia 0.2.0 → 0.2.2
Change-Id: I7b6b15edbec8fa70f374e8ae3cd9a30b8098c2e6
---
M .stylelintrc
M package.json
M src/layouts/BookletLayout.js
M src/layouts/IndexLayout.js
4 files changed, 22 insertions(+), 18 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.stylelintrc b/.stylelintrc
index 5595bb6..37f6ed2 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -6,7 +6,7 @@
"block-no-empty": null,
"block-no-single-line": null,
"declaration-no-important": null,
- "font-family-name-quotes": [ "double-where-recommended" ],
+ "font-family-name-quotes": [ "always-where-recommended" ],
"no-descending-specificity": null,
"string-no-newline": true,
"string-quotes": null
diff --git a/package.json b/package.json
index 4ad0d6c..bef993d 100644
--- a/package.json
+++ b/package.json
@@ -38,23 +38,23 @@
"grunt-contrib-watch": "1.0.0",
"grunt-csscomb":
"git://github.com/jdforrester/grunt-csscomb.git#v3.1.0-wmf.1",
"grunt-cssjanus": "0.3.2",
- "grunt-exec": "0.4.7",
+ "grunt-exec": "1.0.0",
"grunt-file-exists": "0.1.4",
- "grunt-image": "1.5.1",
- "grunt-jscs": "2.8.0",
- "grunt-jsonlint": "1.0.7",
- "grunt-karma": "1.0.0",
+ "grunt-image": "1.5.2",
+ "grunt-jscs": "3.0.1",
+ "grunt-jsonlint": "1.1.0",
+ "grunt-karma": "2.0.0",
"grunt-promise-q":
"git://github.com/jdforrester/grunt-promise-q.git#v0.1.1-wmf.1",
- "grunt-stylelint": "0.3.0",
+ "grunt-stylelint": "0.4.0",
"grunt-svg2png":
"git://github.com/jdforrester/grunt-svg2png.git#v0.2.7-wmf.1",
"grunt-tyops": "0.1.0",
- "karma": "0.13.22",
+ "karma": "1.1.0",
"karma-chrome-launcher": "1.0.1",
"karma-coverage": "1.0.0",
"karma-firefox-launcher": "1.0.0",
- "karma-qunit": "1.0.0",
+ "karma-qunit": "1.1.0",
"q": "1.4.1",
"qunitjs": "1.22.0",
- "stylelint-config-wikimedia": "0.2.0"
+ "stylelint-config-wikimedia": "0.2.2"
}
}
diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js
index 22446d0..09d0cbc 100644
--- a/src/layouts/BookletLayout.js
+++ b/src/layouts/BookletLayout.js
@@ -181,11 +181,13 @@
OO.ui.BookletLayout.prototype.onStackLayoutSet = function ( page ) {
var layout = this;
if ( !this.scrolling && page ) {
- page.scrollElementIntoView( { complete: function () {
- if ( layout.autoFocus ) {
- layout.focus();
+ page.scrollElementIntoView( {
+ complete: function () {
+ if ( layout.autoFocus ) {
+ layout.focus();
+ }
}
- } } );
+ } );
}
};
diff --git a/src/layouts/IndexLayout.js b/src/layouts/IndexLayout.js
index a639413..fe1f6a9 100644
--- a/src/layouts/IndexLayout.js
+++ b/src/layouts/IndexLayout.js
@@ -137,11 +137,13 @@
OO.ui.IndexLayout.prototype.onStackLayoutSet = function ( card ) {
var layout = this;
if ( card ) {
- card.scrollElementIntoView( { complete: function () {
- if ( layout.autoFocus ) {
- layout.focus();
+ card.scrollElementIntoView( {
+ complete: function () {
+ if ( layout.autoFocus ) {
+ layout.focus();
+ }
}
- } } );
+ } );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/293629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b6b15edbec8fa70f374e8ae3cd9a30b8098c2e6
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
