jenkins-bot has submitted this change and it was merged.
Change subject: Update jscs to 2.1.0
......................................................................
Update jscs to 2.1.0
Change-Id: Ibba453510c8e15c3e915d28f7ecf7c296bca7894
---
M Gruntfile.js
M collapsibleTabs.js
M package.json
M vector.js
4 files changed, 17 insertions(+), 13 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index cf68171..3065bf0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,10 +1,10 @@
/*jshint node:true */
module.exports = function ( grunt ) {
+ var conf = grunt.file.readJSON( 'skin.json' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-jscs' );
- var conf = grunt.file.readJSON( 'skin.json' );
grunt.initConfig( {
jshint: {
@@ -12,7 +12,9 @@
jshintrc: true
},
all: [
- '*.js'
+ '*.js',
+ '**/*.js',
+ '!node_modules/**'
]
},
jscs: {
diff --git a/collapsibleTabs.js b/collapsibleTabs.js
index da860ca..bf5ee1c 100644
--- a/collapsibleTabs.js
+++ b/collapsibleTabs.js
@@ -4,12 +4,13 @@
( function ( $ ) {
var rtl = $( 'html' ).attr( 'dir' ) === 'rtl';
$.fn.collapsibleTabs = function ( options ) {
+ // Merge options into the defaults
+ var settings = $.extend( {}, $.collapsibleTabs.defaults,
options );
+
// return if the function is called on an empty jquery object
if ( !this.length ) {
return this;
}
- // Merge options into the defaults
- var settings = $.extend( {}, $.collapsibleTabs.defaults,
options );
this.each( function () {
var $el = $( this );
@@ -160,8 +161,8 @@
.css( 'width', '1px' )
.data( 'collapsibleTabsSettings', data )
.animate( { width: expandedWidth + 'px' },
'normal', function () {
- $( this ).attr( 'style', 'display:
block;' );
var data, expContainerSettings;
+ $( this ).attr( 'style', 'display:
block;' );
data = $.collapsibleTabs.getSettings(
$( this ) );
if ( data ) {
expContainerSettings =
$.collapsibleTabs.getSettings( $( data.expandedContainer ) );
diff --git a/package.json b/package.json
index f1c4292..7c52492 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"grunt-cli": "0.1.13",
"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
- "grunt-jscs": "1.8.0",
+ "grunt-jscs": "2.1.0",
"grunt-jsonlint": "1.0.5"
}
}
diff --git a/vector.js b/vector.js
index 8f83918..11b5193 100644
--- a/vector.js
+++ b/vector.js
@@ -2,6 +2,14 @@
* Vector-specific scripts
*/
jQuery( function ( $ ) {
+
+ /**
+ * Collapsible tabs
+ */
+ var $cactions = $( '#p-cactions' ),
+ $tabContainer = $( '#p-views ul' ),
+ originalDropdownWidth = $cactions.width();
+
/**
* Focus search input at the very end
*/
@@ -32,13 +40,6 @@
// As the h3 can already be focused there's no need for
the link to be focusable
.attr( 'tabindex', '-1' );
} );
-
- /**
- * Collapsible tabs
- */
- var $cactions = $( '#p-cactions' ),
- $tabContainer = $( '#p-views ul' ),
- originalDropdownWidth = $cactions.width();
// Bind callback functions to animate our drop down menu in and out
// and then call the collapsibleTabs function on the menu
--
To view, visit https://gerrit.wikimedia.org/r/227660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibba453510c8e15c3e915d28f7ecf7c296bca7894
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
