| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/CollapsibleTabs/CollapsibleTabs.js |
| — | — | @@ -9,11 +9,10 @@ |
| 10 | 10 | // Overloading the moveToCollapsed function to animate the transition |
| 11 | 11 | $j.collapsibleTabs.moveToCollapsed = function( ele ) { |
| 12 | 12 | var $moving = $j( ele ); |
| 13 | | - $j( $moving.data( 'collapsibleTabsSettings' ).expandedContainer ) |
| 14 | | - .data( 'collapsibleTabsSettings' ).shifting = true; |
| 15 | | - var data = $moving.data( 'collapsibleTabsSettings' ); |
| | 13 | + $j.collapsibleTabs.getSettings( $j( $j.collapsibleTabs.getSettings( $moving ).expandedContainer ) ).shifting = true; |
| | 14 | + var data = $j.collapsibleTabs.getSettings( $moving ); |
| 16 | 15 | // Remove the element from where it's at and put it in the dropdown menu |
| 17 | | - var target = $moving.data( 'collapsibleTabsSettings' ).collapsedContainer; |
| | 16 | + var target = data.collapsedContainer; |
| 18 | 17 | $moving.css( "position", "relative" ) |
| 19 | 18 | .css( ( rtl ? 'left' : 'right' ), 0 ) |
| 20 | 19 | .animate( { width: '1px' }, "normal", function() { |
| — | — | @@ -22,8 +21,8 @@ |
| 23 | 22 | $j( '<span class="placeholder" style="display:none;"></span>' ).insertAfter( this ); |
| 24 | 23 | $j( this ).remove().prependTo( target ).data( 'collapsibleTabsSettings', data ); |
| 25 | 24 | $j( this ).attr( 'style', 'display:list-item;' ); |
| 26 | | - $j( $j( ele ).data( 'collapsibleTabsSettings' ).expandedContainer ) |
| 27 | | - .data( 'collapsibleTabsSettings' ).shifting = false; |
| | 25 | + $j.collapsibleTabs.getSettings( $j( $j.collapsibleTabs.getSettings( $j( ele ) ).expandedContainer ) ) |
| | 26 | + .shifting = false; |
| 28 | 27 | $j.collapsibleTabs.handleResize(); |
| 29 | 28 | } ); |
| 30 | 29 | }; |
| — | — | @@ -31,19 +30,17 @@ |
| 32 | 31 | // Overloading the moveToExpanded function to animate the transition |
| 33 | 32 | $j.collapsibleTabs.moveToExpanded = function( ele ) { |
| 34 | 33 | var $moving = $j( ele ); |
| 35 | | - $j( $moving.data( 'collapsibleTabsSettings' ).expandedContainer ) |
| 36 | | - .data( 'collapsibleTabsSettings' ).shifting = true; |
| 37 | | - var data = $moving.data( 'collapsibleTabsSettings' ); |
| | 34 | + $j.collapsibleTabs.getSettings( $j( $j.collapsibleTabs.getSettings( $moving ).expandedContainer ) ).shifting = true; |
| | 35 | + var data = $j.collapsibleTabs.getSettings( $moving ); |
| 38 | 36 | // grab the next appearing placeholder so we can use it for replacing |
| 39 | | - var $target = $j( $moving.data( 'collapsibleTabsSettings' ).expandedContainer ) |
| 40 | | - .find( 'span.placeholder:first' ); |
| 41 | | - var expandedWidth = $moving.data( 'collapsibleTabsSettings' ).expandedWidth; |
| | 37 | + var $target = $j( data.expandedContainer ).find( 'span.placeholder:first' ); |
| | 38 | + var expandedWidth = data.expandedWidth; |
| 42 | 39 | $moving.css( "position", "relative" ).css( ( rtl ? 'right' : 'left' ), 0 ).css( 'width', '1px' ); |
| 43 | 40 | $target.replaceWith( $moving.remove().css( 'width', '1px' ).data( 'collapsibleTabsSettings', data ) |
| 44 | 41 | .animate( { width: expandedWidth+"px" }, "normal", function() { |
| 45 | 42 | $j( this ).attr( 'style', 'display:block;' ); |
| 46 | | - $j( $moving.data( 'collapsibleTabsSettings' ).expandedContainer ) |
| 47 | | - .data( 'collapsibleTabsSettings' ).shifting = false; |
| | 43 | + $j.collapsibleTabs.getSettings( $j( $j.collapsibleTabs.getSettings( $moving ).expandedContainer ) ) |
| | 44 | + .shifting = false; |
| 48 | 45 | $j.collapsibleTabs.handleResize(); |
| 49 | 46 | } ) ); |
| 50 | 47 | }; |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.hooks.php |
| — | — | @@ -13,16 +13,16 @@ |
| 14 | 14 | static $scripts = array( |
| 15 | 15 | 'raw' => array( |
| 16 | 16 | array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 8 ), |
| 17 | | - array( 'src' => 'Modules/CollapsibleTabs/CollapsibleTabs.js', 'version' => 7 ), |
| | 17 | + array( 'src' => 'Modules/CollapsibleTabs/CollapsibleTabs.js', 'version' => 8 ), |
| 18 | 18 | array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 8 ), |
| 19 | 19 | array( 'src' => 'Modules/FooterCleanup/FooterCleanup.js', 'version' => 5 ), |
| 20 | 20 | array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 8 ), |
| 21 | 21 | ), |
| 22 | 22 | 'combined' => array( |
| 23 | | - array( 'src' => 'Vector.combined.js', 'version' => 24 ), |
| | 23 | + array( 'src' => 'Vector.combined.js', 'version' => 25 ), |
| 24 | 24 | ), |
| 25 | 25 | 'minified' => array( |
| 26 | | - array( 'src' => 'Vector.combined.min.js', 'version' => 24 ), |
| | 26 | + array( 'src' => 'Vector.combined.min.js', 'version' => 25 ), |
| 27 | 27 | ), |
| 28 | 28 | ); |
| 29 | 29 | static $modules = array( |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.js |
| — | — | @@ -47,11 +47,10 @@ |
| 48 | 48 | // Overloading the moveToCollapsed function to animate the transition |
| 49 | 49 | $j.collapsibleTabs.moveToCollapsed = function( ele ) { |
| 50 | 50 | var $moving = $j( ele ); |
| 51 | | - $j( $moving.data( 'collapsibleTabsSettings' ).expandedContainer ) |
| 52 | | - .data( 'collapsibleTabsSettings' ).shifting = true; |
| 53 | | - var data = $moving.data( 'collapsibleTabsSettings' ); |
| | 51 | + $j.collapsibleTabs.getSettings( $j( $j.collapsibleTabs.getSettings( $moving ).expandedContainer ) ).shifting = true; |
| | 52 | + var data = $j.collapsibleTabs.getSettings( $moving ); |
| 54 | 53 | // Remove the element from where it's at and put it in the dropdown menu |
| 55 | | - var target = $moving.data( 'collapsibleTabsSettings' ).collapsedContainer; |
| | 54 | + var target = data.collapsedContainer; |
| 56 | 55 | $moving.css( "position", "relative" ) |
| 57 | 56 | .css( ( rtl ? 'left' : 'right' ), 0 ) |
| 58 | 57 | .animate( { width: '1px' }, "normal", function() { |
| — | — | @@ -60,8 +59,8 @@ |
| 61 | 60 | $j( '<span class="placeholder" style="display:none;"></span>' ).insertAfter( this ); |
| 62 | 61 | $j( this ).remove().prependTo( target ).data( 'collapsibleTabsSettings', data ); |
| 63 | 62 | $j( this ).attr( 'style', 'display:list-item;' ); |
| 64 | | - $j( $j( ele ).data( 'collapsibleTabsSettings' ).expandedContainer ) |
| 65 | | - .data( 'collapsibleTabsSettings' ).shifting = false; |
| | 63 | + $j.collapsibleTabs.getSettings( $j( $j.collapsibleTabs.getSettings( $j( ele ) ).expandedContainer ) ) |
| | 64 | + .shifting = false; |
| 66 | 65 | $j.collapsibleTabs.handleResize(); |
| 67 | 66 | } ); |
| 68 | 67 | }; |
| — | — | @@ -69,19 +68,17 @@ |
| 70 | 69 | // Overloading the moveToExpanded function to animate the transition |
| 71 | 70 | $j.collapsibleTabs.moveToExpanded = function( ele ) { |
| 72 | 71 | var $moving = $j( ele ); |
| 73 | | - $j( $moving.data( 'collapsibleTabsSettings' ).expandedContainer ) |
| 74 | | - .data( 'collapsibleTabsSettings' ).shifting = true; |
| 75 | | - var data = $moving.data( 'collapsibleTabsSettings' ); |
| | 72 | + $j.collapsibleTabs.getSettings( $j( $j.collapsibleTabs.getSettings( $moving ).expandedContainer ) ).shifting = true; |
| | 73 | + var data = $j.collapsibleTabs.getSettings( $moving ); |
| 76 | 74 | // grab the next appearing placeholder so we can use it for replacing |
| 77 | | - var $target = $j( $moving.data( 'collapsibleTabsSettings' ).expandedContainer ) |
| 78 | | - .find( 'span.placeholder:first' ); |
| 79 | | - var expandedWidth = $moving.data( 'collapsibleTabsSettings' ).expandedWidth; |
| | 75 | + var $target = $j( data.expandedContainer ).find( 'span.placeholder:first' ); |
| | 76 | + var expandedWidth = data.expandedWidth; |
| 80 | 77 | $moving.css( "position", "relative" ).css( ( rtl ? 'right' : 'left' ), 0 ).css( 'width', '1px' ); |
| 81 | 78 | $target.replaceWith( $moving.remove().css( 'width', '1px' ).data( 'collapsibleTabsSettings', data ) |
| 82 | 79 | .animate( { width: expandedWidth+"px" }, "normal", function() { |
| 83 | 80 | $j( this ).attr( 'style', 'display:block;' ); |
| 84 | | - $j( $moving.data( 'collapsibleTabsSettings' ).expandedContainer ) |
| 85 | | - .data( 'collapsibleTabsSettings' ).shifting = false; |
| | 81 | + $j.collapsibleTabs.getSettings( $j( $j.collapsibleTabs.getSettings( $moving ).expandedContainer ) ) |
| | 82 | + .shifting = false; |
| 86 | 83 | $j.collapsibleTabs.handleResize(); |
| 87 | 84 | } ) ); |
| 88 | 85 | }; |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.min.js |
| — | — | @@ -1,7 +1,7 @@ |
| 2 | 2 | |
| 3 | 3 | $j(document).ready(function(){if(!wgVectorEnabledModules.collapsiblenav){return true;} |
| 4 | 4 | $j('#panel').addClass('collapsible-nav');$j('#panel > div.portal:first').addClass('expanded').find('div.body').show();$j('#panel > div.portal:not(:first)').each(function(i){var state=$j.cookie('vector-nav-'+$j(this).attr('id'));if(state=='true'||(state==null&&i<1)){$j(this).addClass('expanded').find('div.body').show();}else{$j(this).addClass('collapsed');}});$j('#panel > div.portal > h5').click(function(){$j.cookie('vector-nav-'+$j(this).parent().attr('id'),$j(this).parent().is('.collapsed'));$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');return false;});});$j(document).ready(function(){if(!wgVectorEnabledModules.collapsibletabs){return true;} |
| 5 | | -var rtl=$j('body').is('.rtl');$j.collapsibleTabs.moveToCollapsed=function(ele){var $moving=$j(ele);$j($moving.data('collapsibleTabsSettings').expandedContainer).data('collapsibleTabsSettings').shifting=true;var data=$moving.data('collapsibleTabsSettings');var target=$moving.data('collapsibleTabsSettings').collapsedContainer;$moving.css("position","relative").css((rtl?'left':'right'),0).animate({width:'1px'},"normal",function(){$j(this).hide();$j('<span class="placeholder" style="display:none;"></span>').insertAfter(this);$j(this).remove().prependTo(target).data('collapsibleTabsSettings',data);$j(this).attr('style','display:list-item;');$j($j(ele).data('collapsibleTabsSettings').expandedContainer).data('collapsibleTabsSettings').shifting=false;$j.collapsibleTabs.handleResize();});};$j.collapsibleTabs.moveToExpanded=function(ele){var $moving=$j(ele);$j($moving.data('collapsibleTabsSettings').expandedContainer).data('collapsibleTabsSettings').shifting=true;var data=$moving.data('collapsibleTabsSettings');var $target=$j($moving.data('collapsibleTabsSettings').expandedContainer).find('span.placeholder:first');var expandedWidth=$moving.data('collapsibleTabsSettings').expandedWidth;$moving.css("position","relative").css((rtl?'right':'left'),0).css('width','1px');$target.replaceWith($moving.remove().css('width','1px').data('collapsibleTabsSettings',data).animate({width:expandedWidth+"px"},"normal",function(){$j(this).attr('style','display:block;');$j($moving.data('collapsibleTabsSettings').expandedContainer).data('collapsibleTabsSettings').shifting=false;$j.collapsibleTabs.handleResize();}));};$j('#p-views ul').bind("beforeTabCollapse",function(){if($j('#p-cactions').css('display')=='none') |
| | 5 | +var rtl=$j('body').is('.rtl');$j.collapsibleTabs.moveToCollapsed=function(ele){var $moving=$j(ele);$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=true;var data=$j.collapsibleTabs.getSettings($moving);var target=data.collapsedContainer;$moving.css("position","relative").css((rtl?'left':'right'),0).animate({width:'1px'},"normal",function(){$j(this).hide();$j('<span class="placeholder" style="display:none;"></span>').insertAfter(this);$j(this).remove().prependTo(target).data('collapsibleTabsSettings',data);$j(this).attr('style','display:list-item;');$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($j(ele)).expandedContainer)).shifting=false;$j.collapsibleTabs.handleResize();});};$j.collapsibleTabs.moveToExpanded=function(ele){var $moving=$j(ele);$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=true;var data=$j.collapsibleTabs.getSettings($moving);var $target=$j(data.expandedContainer).find('span.placeholder:first');var expandedWidth=data.expandedWidth;$moving.css("position","relative").css((rtl?'right':'left'),0).css('width','1px');$target.replaceWith($moving.remove().css('width','1px').data('collapsibleTabsSettings',data).animate({width:expandedWidth+"px"},"normal",function(){$j(this).attr('style','display:block;');$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=false;$j.collapsibleTabs.handleResize();}));};$j('#p-views ul').bind("beforeTabCollapse",function(){if($j('#p-cactions').css('display')=='none') |
| 6 | 6 | $j("#p-cactions").addClass("filledPortlet").removeClass("emptyPortlet").find('h5').css('width','1px').animate({'width':'26px'},390);}).bind("beforeTabExpand",function(){if($j('#p-cactions li').length==1) |
| 7 | 7 | $j("#p-cactions h5").animate({'width':'1px'},370,function(){$j(this).attr('style','').parent().addClass("emptyPortlet").removeClass("filledPortlet");});}).collapsibleTabs({expandCondition:function(eleWidth){if(rtl){return($j('#right-navigation').position().left+$j('#right-navigation').width()+1)<($j('#left-navigation').position().left-eleWidth);}else{return($j('#left-navigation').position().left+$j('#left-navigation').width()+1)<($j('#right-navigation').position().left-eleWidth);}},collapseCondition:function(){if(rtl){return($j('#right-navigation').position().left+$j('#right-navigation').width())>$j('#left-navigation').position().left;}else{return($j('#left-navigation').position().left+$j('#left-navigation').width())>$j('#right-navigation').position().left;}}});});$j(document).ready(function(){if(!wgVectorEnabledModules.editwarning||$j('#wpTextbox1').size()==0){return true;} |
| 8 | 8 | $j('#wpTextbox1, #wpSummary').each(function(){$j(this).data('origtext',$j(this).val());});fallbackWindowOnBeforeUnload=window.onbeforeunload;window.onbeforeunload=function(){var fallbackResult=undefined;if(fallbackWindowOnBeforeUnload){fallbackResult=fallbackWindowOnBeforeUnload();} |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | array( 'src' => 'js/plugins/jquery.async.js', 'version' => 3 ), |
| 68 | 68 | array( 'src' => 'js/plugins/jquery.autoEllipsis.js', 'version' => 7 ), |
| 69 | 69 | array( 'src' => 'js/plugins/jquery.browser.js', 'version' => 6 ), |
| 70 | | - array( 'src' => 'js/plugins/jquery.collapsibleTabs.js', 'version' => 5 ), |
| | 70 | + array( 'src' => 'js/plugins/jquery.collapsibleTabs.js', 'version' => 6 ), |
| 71 | 71 | array( 'src' => 'js/plugins/jquery.color.js', 'version' => 1 ), |
| 72 | 72 | array( 'src' => 'js/plugins/jquery.cookie.js', 'version' => 4 ), |
| 73 | 73 | array( 'src' => 'js/plugins/jquery.delayedBind.js', 'version' => 1 ), |
| — | — | @@ -82,10 +82,10 @@ |
| 83 | 83 | array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 5 ), |
| 84 | 84 | ), |
| 85 | 85 | 'combined' => array( |
| 86 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 377 ), |
| | 86 | + array( 'src' => 'js/plugins.combined.js', 'version' => 380 ), |
| 87 | 87 | ), |
| 88 | 88 | 'minified' => array( |
| 89 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 377 ), |
| | 89 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 380 ), |
| 90 | 90 | ), |
| 91 | 91 | ), |
| 92 | 92 | ); |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 93 | 93 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646 |
| /branches/wmf-deployment/extensions/UsabilityInitiative/OptIn:60970 |
| /trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62127,62139-62140,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64651 |
| /trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| 94 | 94 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646 |
| /branches/wmf-deployment/extensions/UsabilityInitiative/OptIn:60970 |
| /trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62127,62139-62140,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64651,64864 |
| /trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 95 | 95 | - /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:60970 |
| /trunk/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62274,62341,62371,62380,62384,62392-62396,62458,62552,63864-63865,63867-63877,63879-64124,64129-64645,64647-64648,64651 |
| 96 | 96 | + /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:60970 |
| /trunk/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62274,62341,62371,62380,62384,62392-62396,62458,62552,63864-63865,63867-63877,63879-64124,64129-64645,64647-64648,64651,64864 |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.collapsibleTabs.js |
| — | — | @@ -15,13 +15,7 @@ |
| 16 | 16 | $this.data( 'collapsibleTabsSettings', $settings ); |
| 17 | 17 | // attach data to our collapsible elements |
| 18 | 18 | $this.children( $settings.collapsible ).each( function() { |
| 19 | | - var $collapsible = $( this ); |
| 20 | | - $collapsible.data( 'collapsibleTabsSettings', { |
| 21 | | - 'expandedContainer': $settings.expandedContainer, |
| 22 | | - 'collapsedContainer': $settings.collapsedContainer, |
| 23 | | - 'expandedWidth': $collapsible.width(), |
| 24 | | - 'prevElement': $collapsible.prev() |
| 25 | | - } ); |
| | 19 | + $.collapsibleTabs.addData( $( this ) ); |
| 26 | 20 | } ); |
| 27 | 21 | } ); |
| 28 | 22 | |
| — | — | @@ -52,9 +46,26 @@ |
| 53 | 47 | > $( '#right-navigation' ).position().left; |
| 54 | 48 | } |
| 55 | 49 | }, |
| | 50 | + addData: function( $collapsible ) { |
| | 51 | + var $settings = $collapsible.parent().data( 'collapsibleTabsSettings' ); |
| | 52 | + $collapsible.data( 'collapsibleTabsSettings', { |
| | 53 | + 'expandedContainer': $settings.expandedContainer, |
| | 54 | + 'collapsedContainer': $settings.collapsedContainer, |
| | 55 | + 'expandedWidth': $collapsible.width(), |
| | 56 | + 'prevElement': $collapsible.prev() |
| | 57 | + } ); |
| | 58 | + }, |
| | 59 | + getSettings: function( $collapsible ) { |
| | 60 | + var $settings = $collapsible.data( 'collapsibleTabsSettings' ); |
| | 61 | + if ( typeof $settings == 'undefined' ) { |
| | 62 | + $.collapsibleTabs.addData( $collapsible ); |
| | 63 | + $settings = $collapsible.data( 'collapsibleTabsSettings' ); |
| | 64 | + } |
| | 65 | + return $settings; |
| | 66 | + }, |
| 56 | 67 | handleResize: function( e ){ |
| 57 | 68 | $.collapsibleTabs.instances.each( function() { |
| 58 | | - var $this = $( this ), data = $this.data( 'collapsibleTabsSettings' ); |
| | 69 | + var $this = $( this ), data = $.collapsibleTabs.getSettings( $this ); |
| 59 | 70 | if( data.shifting ) return; |
| 60 | 71 | |
| 61 | 72 | // if the two navigations are colliding |
| — | — | @@ -68,8 +79,8 @@ |
| 69 | 80 | // if there are still moveable items in the dropdown menu, |
| 70 | 81 | // and there is sufficient space to place them in the tab container |
| 71 | 82 | if( $( data.collapsedContainer + ' ' + data.collapsible ).length > 0 |
| 72 | | - && data.expandCondition( $( data.collapsedContainer ).children( |
| 73 | | - data.collapsible+":first" ).data( 'collapsibleTabsSettings' ).expandedWidth ) ) { |
| | 83 | + && data.expandCondition( $.collapsibleTabs.getSettings( $( data.collapsedContainer ).children( |
| | 84 | + data.collapsible+":first" ) ).expandedWidth ) ) { |
| 74 | 85 | //move the element from the dropdown to the tab |
| 75 | 86 | $this.trigger( "beforeTabExpand" ); |
| 76 | 87 | $.collapsibleTabs |
| — | — | @@ -79,22 +90,24 @@ |
| 80 | 91 | }, |
| 81 | 92 | moveToCollapsed: function( ele ) { |
| 82 | 93 | var $moving = $( ele ); |
| 83 | | - var data = $moving.data( 'collapsibleTabsSettings' ); |
| 84 | | - $( data.expandedContainer ).data( 'collapsibleTabsSettings' ).shifting = true; |
| | 94 | + var data = $.collapsibleTabs.getSettings( $moving ); |
| | 95 | + var dataExp = $.collapsibleTabs.getSettings( data.expandedContainer ); |
| | 96 | + dataExp.shifting = true; |
| 85 | 97 | $moving |
| 86 | 98 | .remove() |
| 87 | 99 | .prependTo( data.collapsedContainer ) |
| 88 | 100 | .data( 'collapsibleTabsSettings', data ); |
| 89 | | - $( data.expandedContainer ).data( 'collapsibleTabsSettings' ).shifting = false; |
| | 101 | + dataExp.shifting = false; |
| 90 | 102 | $.collapsibleTabs.handleResize(); |
| 91 | 103 | }, |
| 92 | 104 | moveToExpanded: function( ele ) { |
| 93 | 105 | var $moving = $( ele ); |
| 94 | | - var data = $moving.data( 'collapsibleTabsSettings' ); |
| 95 | | - $( data.expandedContainer ).data( 'collapsibleTabsSettings' ).shifting = true; |
| | 106 | + var data = $.collapsibleTabs.getSettings( $moving ); |
| | 107 | + var dataExp = $.collapsibleTabs.getSettings( data.expandedContainer ); |
| | 108 | + dataExp.shifting = true; |
| 96 | 109 | // remove this element from where it's at and put it in the dropdown menu |
| 97 | 110 | $moving.remove().insertAfter( data.prevElement ).data( 'collapsibleTabsSettings', data ); |
| 98 | | - $( data.expandedContainer ).data( 'collapsibleTabsSettings' ).shifting = false; |
| | 111 | + dataExp.shifting = false; |
| 99 | 112 | $.collapsibleTabs.handleResize(); |
| 100 | 113 | } |
| 101 | 114 | }; |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 102 | 115 | - /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:60970 |
| /trunk/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62274,62341,62371,62380,62384,62392-62396,62458,62552,63864-63865,63867-63877,63879-64124,64129-64645,64647-64648,64651 |
| 103 | 116 | + /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:60970 |
| /trunk/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62274,62341,62371,62380,62384,62392-62396,62458,62552,63864-63865,63867-63877,63879-64124,64129-64645,64647-64648,64651,64864 |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -5363,13 +5363,7 @@ |
| 5364 | 5364 | $this.data( 'collapsibleTabsSettings', $settings ); |
| 5365 | 5365 | // attach data to our collapsible elements |
| 5366 | 5366 | $this.children( $settings.collapsible ).each( function() { |
| 5367 | | - var $collapsible = $( this ); |
| 5368 | | - $collapsible.data( 'collapsibleTabsSettings', { |
| 5369 | | - 'expandedContainer': $settings.expandedContainer, |
| 5370 | | - 'collapsedContainer': $settings.collapsedContainer, |
| 5371 | | - 'expandedWidth': $collapsible.width(), |
| 5372 | | - 'prevElement': $collapsible.prev() |
| 5373 | | - } ); |
| | 5367 | + $.collapsibleTabs.addData( $( this ) ); |
| 5374 | 5368 | } ); |
| 5375 | 5369 | } ); |
| 5376 | 5370 | |
| — | — | @@ -5400,9 +5394,26 @@ |
| 5401 | 5395 | > $( '#right-navigation' ).position().left; |
| 5402 | 5396 | } |
| 5403 | 5397 | }, |
| | 5398 | + addData: function( $collapsible ) { |
| | 5399 | + var $settings = $collapsible.parent().data( 'collapsibleTabsSettings' ); |
| | 5400 | + $collapsible.data( 'collapsibleTabsSettings', { |
| | 5401 | + 'expandedContainer': $settings.expandedContainer, |
| | 5402 | + 'collapsedContainer': $settings.collapsedContainer, |
| | 5403 | + 'expandedWidth': $collapsible.width(), |
| | 5404 | + 'prevElement': $collapsible.prev() |
| | 5405 | + } ); |
| | 5406 | + }, |
| | 5407 | + getSettings: function( $collapsible ) { |
| | 5408 | + var $settings = $collapsible.data( 'collapsibleTabsSettings' ); |
| | 5409 | + if ( typeof $settings == 'undefined' ) { |
| | 5410 | + $.collapsibleTabs.addData( $collapsible ); |
| | 5411 | + $settings = $collapsible.data( 'collapsibleTabsSettings' ); |
| | 5412 | + } |
| | 5413 | + return $settings; |
| | 5414 | + }, |
| 5404 | 5415 | handleResize: function( e ){ |
| 5405 | 5416 | $.collapsibleTabs.instances.each( function() { |
| 5406 | | - var $this = $( this ), data = $this.data( 'collapsibleTabsSettings' ); |
| | 5417 | + var $this = $( this ), data = $.collapsibleTabs.getSettings( $this ); |
| 5407 | 5418 | if( data.shifting ) return; |
| 5408 | 5419 | |
| 5409 | 5420 | // if the two navigations are colliding |
| — | — | @@ -5416,8 +5427,8 @@ |
| 5417 | 5428 | // if there are still moveable items in the dropdown menu, |
| 5418 | 5429 | // and there is sufficient space to place them in the tab container |
| 5419 | 5430 | if( $( data.collapsedContainer + ' ' + data.collapsible ).length > 0 |
| 5420 | | - && data.expandCondition( $( data.collapsedContainer ).children( |
| 5421 | | - data.collapsible+":first" ).data( 'collapsibleTabsSettings' ).expandedWidth ) ) { |
| | 5431 | + && data.expandCondition( $.collapsibleTabs.getSettings( $( data.collapsedContainer ).children( |
| | 5432 | + data.collapsible+":first" ) ).expandedWidth ) ) { |
| 5422 | 5433 | //move the element from the dropdown to the tab |
| 5423 | 5434 | $this.trigger( "beforeTabExpand" ); |
| 5424 | 5435 | $.collapsibleTabs |
| — | — | @@ -5427,22 +5438,24 @@ |
| 5428 | 5439 | }, |
| 5429 | 5440 | moveToCollapsed: function( ele ) { |
| 5430 | 5441 | var $moving = $( ele ); |
| 5431 | | - var data = $moving.data( 'collapsibleTabsSettings' ); |
| 5432 | | - $( data.expandedContainer ).data( 'collapsibleTabsSettings' ).shifting = true; |
| | 5442 | + var data = $.collapsibleTabs.getSettings( $moving ); |
| | 5443 | + var dataExp = $.collapsibleTabs.getSettings( data.expandedContainer ); |
| | 5444 | + dataExp.shifting = true; |
| 5433 | 5445 | $moving |
| 5434 | 5446 | .remove() |
| 5435 | 5447 | .prependTo( data.collapsedContainer ) |
| 5436 | 5448 | .data( 'collapsibleTabsSettings', data ); |
| 5437 | | - $( data.expandedContainer ).data( 'collapsibleTabsSettings' ).shifting = false; |
| | 5449 | + dataExp.shifting = false; |
| 5438 | 5450 | $.collapsibleTabs.handleResize(); |
| 5439 | 5451 | }, |
| 5440 | 5452 | moveToExpanded: function( ele ) { |
| 5441 | 5453 | var $moving = $( ele ); |
| 5442 | | - var data = $moving.data( 'collapsibleTabsSettings' ); |
| 5443 | | - $( data.expandedContainer ).data( 'collapsibleTabsSettings' ).shifting = true; |
| | 5454 | + var data = $.collapsibleTabs.getSettings( $moving ); |
| | 5455 | + var dataExp = $.collapsibleTabs.getSettings( data.expandedContainer ); |
| | 5456 | + dataExp.shifting = true; |
| 5444 | 5457 | // remove this element from where it's at and put it in the dropdown menu |
| 5445 | 5458 | $moving.remove().insertAfter( data.prevElement ).data( 'collapsibleTabsSettings', data ); |
| 5446 | | - $( data.expandedContainer ).data( 'collapsibleTabsSettings' ).shifting = false; |
| | 5459 | + dataExp.shifting = false; |
| 5447 | 5460 | $.collapsibleTabs.handleResize(); |
| 5448 | 5461 | } |
| 5449 | 5462 | }; |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -371,9 +371,10 @@ |
| 372 | 372 | return r;},c=function(i,a,b,c){var r={name:m((a.exec(i)||[u,u])[1],b)};r[r.name]=true;r.version=(c.exec(i)||[x,x,x,x])[3];if(r.name.match(/safari/)&&r.version>400){r.version='2.0';} |
| 373 | 373 | if(r.name==='presto'){r.version=($.browser.version>9.27)?'futhark':'linear_b';} |
| 374 | 374 | if(r.name==='opera'&&$.browser.version>=9.8){r.version=i.match(/version\/([0-9\.]*)/i)[1]||10;} |
| 375 | | -r.versionNumber=parseFloat(r.version,10)||0;r.versionX=(r.version!==x)?(r.version+'').substr(0,1):x;r.className=r.name+r.versionX;return r;};a=(a.match(/Opera|Navigator|Minefield|KHTML|Chrome/)?m(a,[[/(Firefox|MSIE|KHTML,\slike\sGecko|Konqueror)/,''],['Chrome Safari','Chrome'],['KHTML','Konqueror'],['Minefield','Firefox'],['Navigator','Netscape']]):a).toLowerCase();$.browser=$.extend((!z)?$.browser:{},c(a,/(camino|chrome|firefox|netscape|konqueror|lynx|msie|opera|safari|ipod|iphone|blackberry)/,[],/(camino|chrome|firefox|netscape|netscape6|opera|version|konqueror|lynx|msie|safari)(\/|\s)([a-z0-9\.\+]*?)(\;|dev|rel|\s|$)/));$.layout=c(a,/(gecko|konqueror|msie|opera|webkit)/,[['konqueror','khtml'],['msie','trident'],['opera','presto']],/(applewebkit|rv|konqueror|msie)(\:|\/|\s)([a-z0-9\.]*?)(\;|\)|\s)/);$.os={name:(/(win|mac|linux|sunos|solaris|iphone)/.exec(navigator.platform.toLowerCase())||[u])[0].replace('sunos','solaris')};if(!z){$('html').addClass([$.os.name,$.browser.name,$.browser.className,$.layout.name,$.layout.className].join(' '));}};$.browserTest(navigator.userAgent);})(jQuery);(function($){$.fn.collapsibleTabs=function($$options){if(!this.length)return this;var $settings=$.extend({},$.collapsibleTabs.defaults,$$options);this.each(function(){var $this=$(this);$.collapsibleTabs.instances=($.collapsibleTabs.instances.length==0?$this:$.collapsibleTabs.instances.add($this));$this.data('collapsibleTabsSettings',$settings);$this.children($settings.collapsible).each(function(){var $collapsible=$(this);$collapsible.data('collapsibleTabsSettings',{'expandedContainer':$settings.expandedContainer,'collapsedContainer':$settings.collapsedContainer,'expandedWidth':$collapsible.width(),'prevElement':$collapsible.prev()});});});if(!$.collapsibleTabs.boundEvent){$(window).delayedBind('500','resize',function(){$.collapsibleTabs.handleResize();});} |
| 376 | | -$.collapsibleTabs.handleResize();return this;};$.collapsibleTabs={instances:[],boundEvent:null,defaults:{expandedContainer:'#p-views ul',collapsedContainer:'#p-cactions ul',collapsible:'li.collapsible',shifting:false,expandCondition:function(eleWidth){return($('#left-navigation').position().left+$('#left-navigation').width())<($('#right-navigation').position().left-eleWidth);},collapseCondition:function(){return($('#left-navigation').position().left+$('#left-navigation').width())>$('#right-navigation').position().left;}},handleResize:function(e){$.collapsibleTabs.instances.each(function(){var $this=$(this),data=$this.data('collapsibleTabsSettings');if(data.shifting)return;if($this.children(data.collapsible).length>0&&data.collapseCondition()){$this.trigger("beforeTabCollapse");$.collapsibleTabs.moveToCollapsed($this.children(data.collapsible+':last'));} |
| 377 | | -if($(data.collapsedContainer+' '+data.collapsible).length>0&&data.expandCondition($(data.collapsedContainer).children(data.collapsible+":first").data('collapsibleTabsSettings').expandedWidth)){$this.trigger("beforeTabExpand");$.collapsibleTabs.moveToExpanded(data.collapsedContainer+" "+data.collapsible+':first');}});},moveToCollapsed:function(ele){var $moving=$(ele);var data=$moving.data('collapsibleTabsSettings');$(data.expandedContainer).data('collapsibleTabsSettings').shifting=true;$moving.remove().prependTo(data.collapsedContainer).data('collapsibleTabsSettings',data);$(data.expandedContainer).data('collapsibleTabsSettings').shifting=false;$.collapsibleTabs.handleResize();},moveToExpanded:function(ele){var $moving=$(ele);var data=$moving.data('collapsibleTabsSettings');$(data.expandedContainer).data('collapsibleTabsSettings').shifting=true;$moving.remove().insertAfter(data.prevElement).data('collapsibleTabsSettings',data);$(data.expandedContainer).data('collapsibleTabsSettings').shifting=false;$.collapsibleTabs.handleResize();}};})(jQuery);(function(jQuery){jQuery.each(['backgroundColor','borderBottomColor','borderLeftColor','borderRightColor','borderTopColor','color','outlineColor'],function(i,attr){jQuery.fx.step[attr]=function(fx){if(fx.state==0){fx.start=getColor(fx.elem,attr);fx.end=getRGB(fx.end);} |
| | 375 | +r.versionNumber=parseFloat(r.version,10)||0;r.versionX=(r.version!==x)?(r.version+'').substr(0,1):x;r.className=r.name+r.versionX;return r;};a=(a.match(/Opera|Navigator|Minefield|KHTML|Chrome/)?m(a,[[/(Firefox|MSIE|KHTML,\slike\sGecko|Konqueror)/,''],['Chrome Safari','Chrome'],['KHTML','Konqueror'],['Minefield','Firefox'],['Navigator','Netscape']]):a).toLowerCase();$.browser=$.extend((!z)?$.browser:{},c(a,/(camino|chrome|firefox|netscape|konqueror|lynx|msie|opera|safari|ipod|iphone|blackberry)/,[],/(camino|chrome|firefox|netscape|netscape6|opera|version|konqueror|lynx|msie|safari)(\/|\s)([a-z0-9\.\+]*?)(\;|dev|rel|\s|$)/));$.layout=c(a,/(gecko|konqueror|msie|opera|webkit)/,[['konqueror','khtml'],['msie','trident'],['opera','presto']],/(applewebkit|rv|konqueror|msie)(\:|\/|\s)([a-z0-9\.]*?)(\;|\)|\s)/);$.os={name:(/(win|mac|linux|sunos|solaris|iphone)/.exec(navigator.platform.toLowerCase())||[u])[0].replace('sunos','solaris')};if(!z){$('html').addClass([$.os.name,$.browser.name,$.browser.className,$.layout.name,$.layout.className].join(' '));}};$.browserTest(navigator.userAgent);})(jQuery);(function($){$.fn.collapsibleTabs=function($$options){if(!this.length)return this;var $settings=$.extend({},$.collapsibleTabs.defaults,$$options);this.each(function(){var $this=$(this);$.collapsibleTabs.instances=($.collapsibleTabs.instances.length==0?$this:$.collapsibleTabs.instances.add($this));$this.data('collapsibleTabsSettings',$settings);$this.children($settings.collapsible).each(function(){$.collapsibleTabs.addData($(this));});});if(!$.collapsibleTabs.boundEvent){$(window).delayedBind('500','resize',function(){$.collapsibleTabs.handleResize();});} |
| | 376 | +$.collapsibleTabs.handleResize();return this;};$.collapsibleTabs={instances:[],boundEvent:null,defaults:{expandedContainer:'#p-views ul',collapsedContainer:'#p-cactions ul',collapsible:'li.collapsible',shifting:false,expandCondition:function(eleWidth){return($('#left-navigation').position().left+$('#left-navigation').width())<($('#right-navigation').position().left-eleWidth);},collapseCondition:function(){return($('#left-navigation').position().left+$('#left-navigation').width())>$('#right-navigation').position().left;}},addData:function($collapsible){var $settings=$collapsible.parent().data('collapsibleTabsSettings');$collapsible.data('collapsibleTabsSettings',{'expandedContainer':$settings.expandedContainer,'collapsedContainer':$settings.collapsedContainer,'expandedWidth':$collapsible.width(),'prevElement':$collapsible.prev()});},getSettings:function($collapsible){var $settings=$collapsible.data('collapsibleTabsSettings');if(typeof $settings=='undefined'){$.collapsibleTabs.addData($collapsible);$settings=$collapsible.data('collapsibleTabsSettings');} |
| | 377 | +return $settings;},handleResize:function(e){$.collapsibleTabs.instances.each(function(){var $this=$(this),data=$.collapsibleTabs.getSettings($this);if(data.shifting)return;if($this.children(data.collapsible).length>0&&data.collapseCondition()){$this.trigger("beforeTabCollapse");$.collapsibleTabs.moveToCollapsed($this.children(data.collapsible+':last'));} |
| | 378 | +if($(data.collapsedContainer+' '+data.collapsible).length>0&&data.expandCondition($.collapsibleTabs.getSettings($(data.collapsedContainer).children(data.collapsible+":first")).expandedWidth)){$this.trigger("beforeTabExpand");$.collapsibleTabs.moveToExpanded(data.collapsedContainer+" "+data.collapsible+':first');}});},moveToCollapsed:function(ele){var $moving=$(ele);var data=$.collapsibleTabs.getSettings($moving);var dataExp=$.collapsibleTabs.getSettings(data.expandedContainer);dataExp.shifting=true;$moving.remove().prependTo(data.collapsedContainer).data('collapsibleTabsSettings',data);dataExp.shifting=false;$.collapsibleTabs.handleResize();},moveToExpanded:function(ele){var $moving=$(ele);var data=$.collapsibleTabs.getSettings($moving);var dataExp=$.collapsibleTabs.getSettings(data.expandedContainer);dataExp.shifting=true;$moving.remove().insertAfter(data.prevElement).data('collapsibleTabsSettings',data);dataExp.shifting=false;$.collapsibleTabs.handleResize();}};})(jQuery);(function(jQuery){jQuery.each(['backgroundColor','borderBottomColor','borderLeftColor','borderRightColor','borderTopColor','color','outlineColor'],function(i,attr){jQuery.fx.step[attr]=function(fx){if(fx.state==0){fx.start=getColor(fx.elem,attr);fx.end=getRGB(fx.end);} |
| 378 | 379 | fx.elem.style[attr]="rgb("+[Math.max(Math.min(parseInt((fx.pos*(fx.end[0]-fx.start[0]))+fx.start[0]),255),0),Math.max(Math.min(parseInt((fx.pos*(fx.end[1]-fx.start[1]))+fx.start[1]),255),0),Math.max(Math.min(parseInt((fx.pos*(fx.end[2]-fx.start[2]))+fx.start[2]),255),0)].join(",")+")";}});function getRGB(color){var result;if(color&&color.constructor==Array&&color.length==3) |
| 379 | 380 | return color;if(result=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color)) |
| 380 | 381 | return[parseInt(result[1]),parseInt(result[2]),parseInt(result[3])];if(result=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color)) |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 381 | 382 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
| /branches/wmf-deployment/extensions/UsabilityInitiative:60970 |
| /trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64651 |
| /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| 382 | 383 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
| /branches/wmf-deployment/extensions/UsabilityInitiative:60970 |
| /trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64651,64864 |
| /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |