http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61315
Revision: 61315
Author: adam
Date: 2010-01-20 23:02:43 +0000 (Wed, 20 Jan 2010)
Log Message:
-----------
TOC fix for collapsing on drag if minimum width is reached
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-01-20 22:59:04 UTC (rev 61314)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-01-20 23:02:43 UTC (rev 61315)
@@ -173,7 +173,7 @@
array(
'src' =>
'js/plugins/jquery.wikiEditor.toc.js',
'class' => 'j.wikiEditor.modules.toc',
- 'version' => 68
+ 'version' => 69
),
array(
'src' =>
'js/plugins/jquery.wikiEditor.preview.js',
@@ -191,10 +191,10 @@
'version' => 1 ),
),
'combined' => array(
- array( 'src' => 'js/plugins.combined.js',
'version' => 163 ),
+ array( 'src' => 'js/plugins.combined.js',
'version' => 164 ),
),
'minified' => array(
- array( 'src' => 'js/plugins.combined.min.js',
'version' => 163 ),
+ array( 'src' => 'js/plugins.combined.min.js',
'version' => 164 ),
),
),
);
Modified:
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js
2010-01-20 22:59:04 UTC (rev 61314)
+++ trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js
2010-01-20 23:02:43 UTC (rev 61315)
@@ -489,7 +489,7 @@
stop: function ( e, ui ) {
context.$ui.find(
'.wikiEditor-ui-resize-mask' ).remove();
context.$content.trigger(
'mouseup' );
- if( ui.size.width < parseFloat(
$.wikiEditor.modules.toc.cfg.minimumWidth ) ) {
+ if( ui.size.width <=
parseFloat( $.wikiEditor.modules.toc.cfg.minimumWidth ) ) {
context.modules.toc.$toc.trigger( 'collapse.wikiEditor-toc' );
} else {
context.modules.toc.$toc.find( 'div' ).autoEllipsis( { 'position': 'right',
'tooltip': true, 'restoreText': true } );
Modified: trunk/extensions/UsabilityInitiative/js/plugins.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2010-01-20
22:59:04 UTC (rev 61314)
+++ trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2010-01-20
23:02:43 UTC (rev 61315)
@@ -9088,7 +9088,7 @@
stop: function ( e, ui ) {
context.$ui.find(
'.wikiEditor-ui-resize-mask' ).remove();
context.$content.trigger(
'mouseup' );
- if( ui.size.width < parseFloat(
$.wikiEditor.modules.toc.cfg.minimumWidth ) ) {
+ if( ui.size.width <=
parseFloat( $.wikiEditor.modules.toc.cfg.minimumWidth ) ) {
context.modules.toc.$toc.trigger( 'collapse.wikiEditor-toc' );
} else {
context.modules.toc.$toc.find( 'div' ).autoEllipsis( { 'position': 'right',
'tooltip': true, 'restoreText': true } );
Modified: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
2010-01-20 22:59:04 UTC (rev 61314)
+++ trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
2010-01-20 23:02:43 UTC (rev 61315)
@@ -596,7 +596,7 @@
return list;}
function buildCollapseControls(){var $collapseControl=$('<div
/>'),$expandControl=$('<div
/>');$collapseControl.addClass('tab').addClass('tab-toc').append('<a href="#"
/>').bind('click.wikiEditor-toc',function(){context.modules.toc.$toc.trigger('collapse.wikiEditor-toc');return
false;}).find('a').text(gM('wikieditor-toc-hide'));$expandControl.addClass('wikiEditor-ui-toc-expandControl').append('<a
href="#"
/>').bind('click.wikiEditor-toc',function(){context.modules.toc.$toc.trigger('expand.wikiEditor-toc');return
false;}).hide().find('a').text(gM('wikieditor-toc-show'));$collapseControl.insertBefore(context.modules.toc.$toc);context.$ui.find('.wikiEditor-ui-left
.wikiEditor-ui-top').append($expandControl);}
function
buildResizeControls(){context.$ui.data('resizableDone',true).find('.wikiEditor-ui-right').data('wikiEditor-ui-left',context.$ui.find('.wikiEditor-ui-left')).resizable({handles:'w,e',preventPositionLeftChange:true,minWidth:parseFloat($.wikiEditor.modules.toc.cfg.minimumWidth),start:function(e,ui){var
$this=$(this);$('<div
/>').addClass('wikiEditor-ui-resize-mask').css({'position':'absolute','z-index':2,'left':0,'top':0,'bottom':0,'right':0}).appendTo(context.$ui.find('.wikiEditor-ui-left'));$this.resizable('option','maxWidth',$this.parent().width()-
-parseFloat($.wikiEditor.modules.toc.cfg.textMinimumWidth));if(context.modules.toc.$toc.data('positionMode')=='goofy'){$.wikiEditor.modules.toc.fn.switchLayout(context);}},resize:function(e,ui){$(this).css({'width':ui.size.width,'top':'auto','height':'auto'}).data('wikiEditor-ui-left').css('marginRight',(-1*ui.size.width)).children().css('marginRight',ui.size.width);context.fn.trigger('resize');},stop:function(e,ui){context.$ui.find('.wikiEditor-ui-resize-mask').remove();context.$content.trigger('mouseup');if(ui.size.width<parseFloat($.wikiEditor.modules.toc.cfg.minimumWidth)){context.modules.toc.$toc.trigger('collapse.wikiEditor-toc');}else{context.modules.toc.$toc.find('div').autoEllipsis({'position':'right','tooltip':true,'restoreText':true});context.modules.toc.$toc.data('openWidth',ui.size.width);$.cookie('wikiEditor-'+context.instance+'-toc-width',ui.size.width);}
+parseFloat($.wikiEditor.modules.toc.cfg.textMinimumWidth));if(context.modules.toc.$toc.data('positionMode')=='goofy'){$.wikiEditor.modules.toc.fn.switchLayout(context);}},resize:function(e,ui){$(this).css({'width':ui.size.width,'top':'auto','height':'auto'}).data('wikiEditor-ui-left').css('marginRight',(-1*ui.size.width)).children().css('marginRight',ui.size.width);context.fn.trigger('resize');},stop:function(e,ui){context.$ui.find('.wikiEditor-ui-resize-mask').remove();context.$content.trigger('mouseup');if(ui.size.width<=parseFloat($.wikiEditor.modules.toc.cfg.minimumWidth)){context.modules.toc.$toc.trigger('collapse.wikiEditor-toc');}else{context.modules.toc.$toc.find('div').autoEllipsis({'position':'right','tooltip':true,'restoreText':true});context.modules.toc.$toc.data('openWidth',ui.size.width);$.cookie('wikiEditor-'+context.instance+'-toc-width',ui.size.width);}
context.fn.trigger('resize');}});var
handle=$.wikiEditor.modules.toc.cfg.rtl?'w':'e';context.$ui.find('.ui-resizable-'+handle).removeClass('ui-resizable-'+handle).addClass('ui-resizable-'+(handle=='w'?'e':'w')).addClass('wikiEditor-ui-toc-resize-grip');context.modules.toc.$toc.bind('collapse.wikiEditor-toc',$.wikiEditor.modules.toc.fn.collapse).bind('expand.wikiEditor-toc',$.wikiEditor.modules.toc.fn.expand);context.modules.toc.$toc.data('openWidth',$.wikiEditor.modules.toc.cfg.defaultWidth);if($.cookie('wikiEditor-'+context.instance+'-toc-width')==0){context.modules.toc.$toc.trigger('collapse.wikiEditor-toc',{data:context});}else
if($.cookie('wikiEditor-'+context.instance+'-toc-width')>0){var
initialWidth=$.cookie('wikiEditor-'+context.instance+'-toc-width');if(initialWidth<parseFloat($.wikiEditor.modules.toc.cfg.minimumWidth))
initialWidth=parseFloat($.wikiEditor.modules.toc.cfg.minimumWidth)+1;context.modules.toc.$toc.data('openWidth',initialWidth+'px');$.wikiEditor.modules.toc.fn.redraw(context,initialWidth);}}
if(context.data.outline){var outline=context.data.outline;var lastLevel=0;var
nLevel=0;for(var
i=0;i<outline.length;i++){if(outline[i].level>lastLevel){nLevel++;}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
