From d225058b9e2e2191f36f39dfa6dcf42f12e6b042 Mon Sep 17 00:00:00 2001
From: Yaroslav Melnychuk <yaroslavmelnuchuk@gmail.com>
Date: Fri, 22 Nov 2013 02:03:12 +0200
Subject: [PATCH] Fix collapsibleTabs code cleanup: null != undefined &
 undefined variables passed to .data().

Bug: 50193
Change-Id: Ia7347f7e95ee6c4421f207166b15572011b188e2
---
 skins/vector/collapsibleTabs.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/skins/vector/collapsibleTabs.js b/skins/vector/collapsibleTabs.js
index e3c2c51966..83d043e6b9 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 ) {
-- 
2.20.1