jenkins-bot has submitted this change and it was merged.
Change subject: Fix collapsibleTabs code cleanup: null != undefined & undefined
variables passed to .data().
......................................................................
Fix collapsibleTabs code cleanup: null != undefined & undefined variables
passed to .data().
Bug: 50193
Change-Id: Ia7347f7e95ee6c4421f207166b15572011b188e2
---
M skins/vector/collapsibleTabs.js
1 file changed, 8 insertions(+), 10 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/skins/vector/collapsibleTabs.js b/skins/vector/collapsibleTabs.js
index e3c2c51..83d043e 100644
--- a/skins/vector/collapsibleTabs.js
+++ b/skins/vector/collapsibleTabs.js
@@ -82,7 +82,7 @@
},
addData: function ( $collapsible ) {
var $settings = $collapsible.parent().data(
'collapsibleTabsSettings' );
- if ( $settings !== null ) {
+ if ( $settings ) {
$collapsible.data( 'collapsibleTabsSettings', {
expandedContainer:
$settings.expandedContainer,
collapsedContainer:
$settings.collapsedContainer,
@@ -93,7 +93,7 @@
},
getSettings: function ( $collapsible ) {
var $settings = $collapsible.data(
'collapsibleTabsSettings' );
- if ( $settings === undefined ) {
+ if ( !$settings ) {
$.collapsibleTabs.addData( $collapsible );
$settings = $collapsible.data(
'collapsibleTabsSettings' );
}
@@ -132,21 +132,21 @@
} );
},
moveToCollapsed: function ( ele ) {
- var data, expContainerSettings, target,
+ var outerData, expContainerSettings, target,
$moving = $( ele );
- data = $.collapsibleTabs.getSettings( $moving );
- if ( !data ) {
+ outerData = $.collapsibleTabs.getSettings( $moving );
+ if ( !outerData ) {
return;
}
- expContainerSettings = $.collapsibleTabs.getSettings(
$( data.expandedContainer ) );
+ expContainerSettings = $.collapsibleTabs.getSettings(
$( outerData.expandedContainer ) );
if ( !expContainerSettings ) {
return;
}
expContainerSettings.shifting = true;
// Remove the element from where it's at and put it in
the dropdown menu
- target = data.collapsedContainer;
+ target = outerData.collapsedContainer;
$moving.css( 'position', 'relative' )
.css( ( rtl ? 'left' : 'right' ), 0 )
.animate( { width: '1px' }, 'normal', function
() {
@@ -154,9 +154,7 @@
$( this ).hide();
// add the placeholder
$( '<span class="placeholder"
style="display: none;"></span>' ).insertAfter( this );
- // XXX: 'data' is undefined here,
should the 'data' from the outer scope have
- // a different name?
- $( this ).detach().prependTo( target
).data( 'collapsibleTabsSettings', data );
+ $( this ).detach().prependTo( target
).data( 'collapsibleTabsSettings', outerData );
$( this ).attr( 'style', 'display:
list-item;' );
data = $.collapsibleTabs.getSettings(
$( ele ) );
if ( data ) {
--
To view, visit https://gerrit.wikimedia.org/r/96918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7347f7e95ee6c4421f207166b15572011b188e2
Gerrit-PatchSet: 13
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Yamelnychuk <yaroslavmelnuc...@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Daniel Friesen <dan...@nadir-seen-fire.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: Kipod <fur.hew...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Waldir <wal...@email.com>
Gerrit-Reviewer: Yamelnychuk <yaroslavmelnuc...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
