jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327933 )
Change subject: Update to match vector changes
......................................................................
Update to match vector changes
Change-Id: If7ecb320a0642a66c009622946f560c6934379ca
---
M .gitignore
M components/search.less
M js/collapsibleTabs.js
A jsduck.json
M package.json
5 files changed, 80 insertions(+), 57 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 53bbca6..7c9e72a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,11 +18,10 @@
sftp-config.json
# Building & testing
-node_modules/
-
-# Composer
-/vendor
/composer.lock
+/docs
+/node_modules
+/vendor
# Operating systems
## Mac OS X
diff --git a/components/search.less b/components/search.less
index bbf9dc8..e7aa78e 100644
--- a/components/search.less
+++ b/components/search.less
@@ -103,6 +103,9 @@
direction: ltr;
white-space: nowrap;
overflow: hidden;
+ }
+
+ #searchButton {
.background-image-svg('images/search-ltr.svg',
'images/search-ltr.png');
background-position: center center;
background-repeat: no-repeat;
@@ -229,6 +232,9 @@
direction: ltr;
white-space: nowrap;
overflow: hidden;
+ }
+
+ #searchButton {
.background-image-svg('images/search-ltr.svg',
'images/search-ltr.png');
background-position: center center;
background-repeat: no-repeat;
diff --git a/js/collapsibleTabs.js b/js/collapsibleTabs.js
index 1c8891f..30367da 100644
--- a/js/collapsibleTabs.js
+++ b/js/collapsibleTabs.js
@@ -1,10 +1,31 @@
/**
- * Collapsible tabs jQuery Plugin
+ * Collapsible Tabs for the Metrolook skin.
+ *
+ * @class jQuery.plugin.collapsibleTabs
*/
( function ( $ ) {
- var rtl = $( 'html' ).attr( 'dir' ) === 'rtl',
+ var isRTL = document.documentElement.dir === 'rtl',
+ boundEvent = false,
rAF = window.requestAnimationFrame || setTimeout;
+ /**
+ * @event beforeTabCollapse
+ */
+
+ /**
+ * @event afterTabCollapse
+ */
+
+ /**
+ * @param {Object} [options]
+ * @param {string} [options.expandedContainer="#p-views ul"] List of
tabs
+ * @param {string} [options.collapsedContainer="#p-cactions ul"] List
of menu items
+ * @param {string} [options.collapsible="li.collapsible"] Match tabs
that are collapsible
+ * @param {Function} [options.expandCondition]
+ * @param {Function} [options.collapseCondition]
+ * @return {jQuery}
+ * @chainable
+ */
$.fn.collapsibleTabs = function ( options ) {
// Merge options into the defaults
var settings = $.extend( {}, $.collapsibleTabs.defaults,
options );
@@ -17,7 +38,7 @@
this.each( function () {
var $el = $( this );
// add the element to our array of collapsible managers
- $.collapsibleTabs.instances =
$.collapsibleTabs.instances.add( $el );
+ $.collapsibleTabs.instances.push( $el );
// attach the settings to the elements
$el.data( 'collapsibleTabsSettings', settings );
// attach data to our collapsible elements
@@ -27,11 +48,11 @@
} );
// if we haven't already bound our resize handler, bind it now
- if ( !$.collapsibleTabs.boundEvent ) {
+ if ( !boundEvent ) {
+ boundEvent = true;
$( window ).on( 'resize', $.debounce( 100, function () {
rAF( $.collapsibleTabs.handleResize );
} ) );
- $.collapsibleTabs.boundEvent = true;
}
// call our resize handler to setup the page
@@ -39,8 +60,7 @@
return this;
};
$.collapsibleTabs = {
- instances: $( [] ),
- boundEvent: null,
+ instances: [],
defaults: {
expandedContainer: '#p-views ul',
collapsedContainer: '#p-cactions ul',
@@ -62,8 +82,7 @@
$collapsible.data( 'collapsibleTabsSettings', {
expandedContainer:
settings.expandedContainer,
collapsedContainer:
settings.collapsedContainer,
- expandedWidth: $collapsible.width(),
- prevElement: $collapsible.prev()
+ expandedWidth: $collapsible.width()
} );
}
},
@@ -76,17 +95,14 @@
return settings;
},
handleResize: function () {
- $.collapsibleTabs.instances.each( function () {
- var $el = $( this ),
- data = $.collapsibleTabs.getSettings(
$el );
-
+ $.each( $.collapsibleTabs.instances, function ( i, $el
) {
+ var data = $.collapsibleTabs.getSettings( $el );
if ( data.shifting ) {
return;
}
// if the two navigations are colliding
- if ( $el.children( data.collapsible ).length >
0 && data.collapseCondition() ) {
-
+ if ( $el.children( data.collapsible ).length &&
data.collapseCondition() ) {
$el.trigger( 'beforeTabCollapse' );
// move the element to the dropdown menu
$.collapsibleTabs.moveToCollapsed(
$el.children( data.collapsible + ':last' ) );
@@ -94,7 +110,7 @@
// if there are still moveable items in the
dropdown menu,
// and there is sufficient space to place them
in the tab container
- if ( $( data.collapsedContainer + ' ' +
data.collapsible ).length > 0 &&
+ if ( $( data.collapsedContainer + ' ' +
data.collapsible ).length &&
data.expandCondition(
$.collapsibleTabs.getSettings( $( data.collapsedContainer ).children(
data.collapsible + ':first' ) ).expandedWidth ) ) {
// move the element from the dropdown
to the tab
@@ -104,9 +120,8 @@
}
} );
},
- moveToCollapsed: function ( ele ) {
- var outerData, expContainerSettings, target,
- $moving = $( ele );
+ moveToCollapsed: function ( $moving ) {
+ var outerData, expContainerSettings, target;
outerData = $.collapsibleTabs.getSettings( $moving );
if ( !outerData ) {
@@ -121,22 +136,15 @@
// Remove the element from where it's at and put it in
the dropdown menu
target = outerData.collapsedContainer;
$moving.css( 'position', 'relative' )
- .css( ( rtl ? 'left' : 'right' ), 0 )
+ .css( ( isRTL ? 'left' : 'right' ), 0 )
.animate( { width: '1px' }, 'normal', function
() {
- var data, expContainerSettings;
$( this ).hide();
// add the placeholder
$( '<span class="placeholder"
style="display: none;"></span>' ).insertAfter( this );
$( this ).detach().prependTo( target
).data( 'collapsibleTabsSettings', outerData );
$( this ).attr( 'style', 'display:
list-item;' );
- data = $.collapsibleTabs.getSettings(
$( ele ) );
- if ( data ) {
- expContainerSettings =
$.collapsibleTabs.getSettings( $( data.expandedContainer ) );
- if ( expContainerSettings ) {
-
expContainerSettings.shifting = false;
- rAF(
$.collapsibleTabs.handleResize );
- }
- }
+ expContainerSettings.shifting = false;
+ rAF( $.collapsibleTabs.handleResize );
} );
},
moveToExpanded: function ( ele ) {
@@ -156,54 +164,52 @@
// grab the next appearing placeholder so we can use it
for replacing
$target = $( data.expandedContainer ).find(
'span.placeholder:first' );
expandedWidth = data.expandedWidth;
- $moving.css( 'position', 'relative' ).css( ( rtl ?
'right' : 'left' ), 0 ).css( 'width', '1px' );
+ $moving.css( 'position', 'relative' ).css( ( isRTL ?
'right' : 'left' ), 0 ).css( 'width', '1px' );
$target.replaceWith(
$moving
.detach()
.css( 'width', '1px' )
.data( 'collapsibleTabsSettings', data )
.animate( { width: expandedWidth + 'px' },
'normal', function () {
- var data, expContainerSettings;
$( this ).attr( 'style', 'display:
block;' );
- data = $.collapsibleTabs.getSettings(
$( this ) );
- if ( data ) {
- expContainerSettings =
$.collapsibleTabs.getSettings( $( data.expandedContainer ) );
- if ( expContainerSettings ) {
-
expContainerSettings.shifting = false;
- rAF(
$.collapsibleTabs.handleResize );
- }
- }
+ expContainerSettings.shifting = false;
+ rAF( $.collapsibleTabs.handleResize );
} )
);
},
/**
- * Returns the amount of horizontal distance between the two
tabs groups
- * (#left-navigation and #right-navigation), in pixels. If
negative, this
+ * Get the amount of horizontal distance between the two tabs
groups in pixels.
+ *
+ * Uses `#left-navigation` and `#right-navigation`. If
negative, this
* means that the tabs overlap, and the value is the width of
overlapping
* parts.
*
- * Used in default expandCondition and collapseCondition.
+ * Used in default `expandCondition` and `collapseCondition`
options.
*
- * @return {Numeric} distance/overlap in pixels
+ * @return {number} distance/overlap in pixels
*/
calculateTabDistance: function () {
- var $leftTab, $rightTab, leftEnd, rightStart;
+ var leftTab, rightTab, leftEnd, rightStart;
// In RTL, #right-navigation is actually on the left
and vice versa.
// Hooray for descriptive naming.
- if ( !rtl ) {
- $leftTab = $( '#left-navigation' );
- $rightTab = $( '#right-navigation' );
+ if ( !isRTL ) {
+ leftTab = document.getElementById(
'left-navigation' );
+ rightTab = document.getElementById(
'right-navigation' );
} else {
- $leftTab = $( '#right-navigation' );
- $rightTab = $( '#left-navigation' );
+ leftTab = document.getElementById(
'right-navigation' );
+ rightTab = document.getElementById(
'left-navigation' );
}
- leftEnd = $leftTab.offset().left + $leftTab.width();
- rightStart = $rightTab.offset().left;
-
+ leftEnd = leftTab.getBoundingClientRect().right;
+ rightStart = rightTab.getBoundingClientRect().left;
return rightStart - leftEnd;
}
};
+ /**
+ * @class jQuery
+ * @mixins jQuery.plugin.collapsibleTabs
+ */
+
}( jQuery ) );
diff --git a/jsduck.json b/jsduck.json
new file mode 100644
index 0000000..315d7c4
--- /dev/null
+++ b/jsduck.json
@@ -0,0 +1,10 @@
+{
+ "--title": "Metrolook skin - Documentation",
+ "--output": "docs",
+ "--processes": "0",
+ "--warnings-exit-nonzero": true,
+ "--warnings": ["-nodoc(class,public)"],
+ "--": [
+ "js/collapsibleTabs.js"
+ ]
+}
diff --git a/package.json b/package.json
index a7883f7..22a0263 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,8 @@
{
+ "private": true,
"scripts": {
- "test": "grunt test"
+ "test": "grunt test",
+ "doc": "jsduck"
},
"devDependencies": {
"grunt": "1.0.1",
--
To view, visit https://gerrit.wikimedia.org/r/327933
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7ecb320a0642a66c009622946f560c6934379ca
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox <[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
