| Index: trunk/extensions/UsabilityInitiative/css/vector.expandableSearch.css |
| — | — | @@ -1,6 +1,5 @@ |
| 2 | 2 | .expandableField { |
| 3 | 3 | display: block; |
| 4 | | - float: left; |
| 5 | 4 | } |
| 6 | 5 | #simpleSearch { |
| 7 | 6 | overflow: auto; |
| Index: trunk/extensions/UsabilityInitiative/css/combined.css |
| — | — | @@ -38,10 +38,8 @@ |
| 39 | 39 | color: WindowText; |
| 40 | 40 | margin: 0; |
| 41 | 41 | width: 100%; |
| 42 | | -} |
| 43 | | -.suggestions-result span { |
| 44 | 42 | line-height: 1.5em; |
| 45 | | - padding: 0.25em 0.25em; |
| | 43 | + padding: 0.01em 0.25em; |
| 46 | 44 | } |
| 47 | 45 | .suggestions-result-current { |
| 48 | 46 | background-color: #4C59A6; |
| — | — | @@ -64,6 +62,9 @@ |
| 65 | 63 | .suggestions-result-current .special-query { |
| 66 | 64 | color: white; |
| 67 | 65 | color: HighlightText; |
| | 66 | +} |
| | 67 | +.autoellipsis-matched { |
| | 68 | + font-weight: bold; |
| 68 | 69 | }/* Prototype code to show collapsing left nav options */ |
| 69 | 70 | #mw-panel.collapsible-nav div.portal { |
| 70 | 71 | background-image:url(../images/vector/collapsibleNav/portal-break.png?1); |
| — | — | @@ -134,7 +135,6 @@ |
| 135 | 136 | } |
| 136 | 137 | .expandableField { |
| 137 | 138 | display: block; |
| 138 | | - float: left; |
| 139 | 139 | } |
| 140 | 140 | #simpleSearch { |
| 141 | 141 | overflow: auto; |
| Index: trunk/extensions/UsabilityInitiative/css/combined.min.css |
| — | — | @@ -36,10 +36,8 @@ |
| 37 | 37 | color:WindowText; |
| 38 | 38 | margin:0; |
| 39 | 39 | width:100%; |
| 40 | | -} |
| 41 | | -.suggestions-result span{ |
| 42 | 40 | line-height:1.5em; |
| 43 | | -padding:0.25em 0.25em; |
| | 41 | +padding:0.01em 0.25em; |
| 44 | 42 | } |
| 45 | 43 | .suggestions-result-current{ |
| 46 | 44 | background-color:#4C59A6; |
| — | — | @@ -63,6 +61,9 @@ |
| 64 | 62 | color:white; |
| 65 | 63 | color:HighlightText; |
| 66 | 64 | } |
| | 65 | +.autoellipsis-matched{ |
| | 66 | +font-weight:bold; |
| | 67 | +} |
| 67 | 68 | #mw-panel.collapsible-nav div.portal{ |
| 68 | 69 | background-image:url(../images/vector/collapsibleNav/portal-break.png?1); |
| 69 | 70 | background-position:left top; |
| — | — | @@ -132,7 +133,6 @@ |
| 133 | 134 | } |
| 134 | 135 | .expandableField{ |
| 135 | 136 | display:block; |
| 136 | | -float:left; |
| 137 | 137 | } |
| 138 | 138 | #simpleSearch{ |
| 139 | 139 | overflow:auto; |
| Index: trunk/extensions/UsabilityInitiative/Vector/Modules/ExpandableSearch/ExpandableSearch.js |
| — | — | @@ -38,8 +38,10 @@ |
| 39 | 39 | if ( typeof $j.collapsibleTabs != 'undefined' ){ |
| 40 | 40 | $j.collapsibleTabs.handleResize(); |
| 41 | 41 | } |
| 42 | | - } |
| | 42 | + }, |
| | 43 | + 'expandToLeft': ! $j( 'body' ).is( '.rtl' ) |
| 43 | 44 | } ) |
| | 45 | + .css( 'float', $j( 'body' ).is( '.rtl' ) ? 'right' : 'left' ) |
| 44 | 46 | .siblings( 'button' ) |
| 45 | | - .css( 'float', 'right' ); |
| | 47 | + .css( 'float', $j( 'body' ).is( '.rtl' ) ? 'left' : 'right' ); |
| 46 | 48 | }); |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php |
| — | — | @@ -14,16 +14,16 @@ |
| 15 | 15 | 'raw' => array( |
| 16 | 16 | array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 25 ), |
| 17 | 17 | array( 'src' => 'Modules/CollapsibleTabs/CollapsibleTabs.js', 'version' => 8 ), |
| 18 | | - array( 'src' => 'Modules/ExpandableSearch/ExpandableSearch.js', 'version' => 3 ), |
| | 18 | + array( 'src' => 'Modules/ExpandableSearch/ExpandableSearch.js', 'version' => 4 ), |
| 19 | 19 | array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 8 ), |
| 20 | 20 | array( 'src' => 'Modules/FooterCleanup/FooterCleanup.js', 'version' => 5 ), |
| 21 | 21 | array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 16 ), |
| 22 | 22 | ), |
| 23 | 23 | 'combined' => array( |
| 24 | | - array( 'src' => 'Vector.combined.js', 'version' => 49 ), |
| | 24 | + array( 'src' => 'Vector.combined.js', 'version' => 50 ), |
| 25 | 25 | ), |
| 26 | 26 | 'minified' => array( |
| 27 | | - array( 'src' => 'Vector.combined.min.js', 'version' => 49 ), |
| | 27 | + array( 'src' => 'Vector.combined.min.js', 'version' => 50 ), |
| 28 | 28 | ), |
| 29 | 29 | ); |
| 30 | 30 | static $modules = array( |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js |
| — | — | @@ -380,10 +380,12 @@ |
| 381 | 381 | if ( typeof $j.collapsibleTabs != 'undefined' ){ |
| 382 | 382 | $j.collapsibleTabs.handleResize(); |
| 383 | 383 | } |
| 384 | | - } |
| | 384 | + }, |
| | 385 | + 'expandToLeft': ! $j( 'body' ).is( '.rtl' ) |
| 385 | 386 | } ) |
| | 387 | + .css( 'float', $j( 'body' ).is( '.rtl' ) ? 'right' : 'left' ) |
| 386 | 388 | .siblings( 'button' ) |
| 387 | | - .css( 'float', 'right' ); |
| | 389 | + .css( 'float', $j( 'body' ).is( '.rtl' ) ? 'left' : 'right' ); |
| 388 | 390 | }); |
| 389 | 391 | /* Prototype code to demonstrate proposed edit page footer cleanups */ |
| 390 | 392 | /* First draft and will be changing greatly */ |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | if(fallbackResult!==undefined){return fallbackResult;} |
| 21 | 21 | if(wgAction=='submit'||$j('#wpTextbox1').data('origtext')!=$j('#wpTextbox1').val()||$j('#wpSummary').data('origtext')!=$j('#wpSummary').val()){return mw.usability.getMsg('vector-editwarning-warning');}} |
| 22 | 22 | $j('form').submit(function(){window.onbeforeunload=fallbackWindowOnBeforeUnload;});});var fallbackWindowOnBeforeUnload=null;$j(document).ready(function(){if(!wgVectorEnabledModules.expandablesearch||skin!='vector'){return true;} |
| 23 | | -$j('#searchInput').expandableField({'beforeExpand':function(context){$j(this).parent().animate({'borderTopColor':'#a0d8ff','borderLeftColor':'#a0d8ff','borderRightColor':'#a0d8ff','borderBottomColor':'#a0d8ff'},'fast');},'beforeCondense':function(context){$j(this).parent().animate({'borderTopColor':'#aaaaaa','borderLeftColor':'#aaaaaa','borderRightColor':'#aaaaaa','borderBottomColor':'#aaaaaa'},'fast');},'afterExpand':function(context){if(typeof $j.collapsibleTabs!='undefined'){$j.collapsibleTabs.handleResize();}},'afterCondense':function(context){if(typeof $j.collapsibleTabs!='undefined'){$j.collapsibleTabs.handleResize();}}}).siblings('button').css('float','right');});$j(document).ready(function(){if(!wgVectorEnabledModules.footercleanup){return true;} |
| | 23 | +$j('#searchInput').expandableField({'beforeExpand':function(context){$j(this).parent().animate({'borderTopColor':'#a0d8ff','borderLeftColor':'#a0d8ff','borderRightColor':'#a0d8ff','borderBottomColor':'#a0d8ff'},'fast');},'beforeCondense':function(context){$j(this).parent().animate({'borderTopColor':'#aaaaaa','borderLeftColor':'#aaaaaa','borderRightColor':'#aaaaaa','borderBottomColor':'#aaaaaa'},'fast');},'afterExpand':function(context){if(typeof $j.collapsibleTabs!='undefined'){$j.collapsibleTabs.handleResize();}},'afterCondense':function(context){if(typeof $j.collapsibleTabs!='undefined'){$j.collapsibleTabs.handleResize();}},'expandToLeft':!$j('body').is('.rtl')}).css('float',$j('body').is('.rtl')?'right':'left').siblings('button').css('float',$j('body').is('.rtl')?'left':'right');});$j(document).ready(function(){if(!wgVectorEnabledModules.footercleanup){return true;} |
| 24 | 24 | $j('#editpage-copywarn').add('.editOptions').wrapAll('<div id="editpage-bottom"></div>');$j('#wpSummary').data('hint',$j('#wpSummaryLabel span small').remove().text().replace(/\)|\(/g,'')).change(function(){if($j(this).val().length==0){$j(this).addClass('inline-hint').val($j(this).data('hint'));}else{$j(this).removeClass('inline-hint');}}).focus(function(){if($j(this).val()==$j(this).data('hint')){$j(this).removeClass('inline-hint').val("");}}).blur(function(){$j(this).trigger('change');}).trigger('change');$j('#wpSummary').add('.editCheckboxes').wrapAll('<div id="editpage-summary-fields"></div>');$j('#editpage-specialchars').remove();var transclusionCount=$j('.templatesUsed ul li').size();$j('.templatesUsed ul').wrap('<div id="transclusions-list" class="collapsible-list collapsed"></div>').parent().prepend('<label>This page contains <a href="http://en.wikipedia.org/wiki/transclusion">transclusions</a> of <strong>' |
| 25 | 25 | +transclusionCount |
| 26 | 26 | +'</strong> other pages.</label>');$j('.mw-templatesUsedExplanation').remove();$j('.collapsible-list label').click(function(){$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('ul').slideToggle('fast');return false;}).trigger('click');$j('#wpPreview, #wpDiff, .editHelp, #editpage-specialchars').remove();$j('#mw-editform-cancel').remove().appendTo('.editButtons');});if(wgVectorEnabledModules.simplesearch&&skin=='vector'&&typeof os_autoload_inputs!=='undefined'&&os_autoload_forms!=='undefined'){os_autoload_inputs=[];os_autoload_forms=[];} |
| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | 'raw' => array( |
| 22 | 22 | array( 'src' => 'css/suggestions.css', 'version' => 15 ), |
| 23 | 23 | array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 12 ), |
| 24 | | - array( 'src' => 'css/vector.expandableSearch.css', 'version' => 3 ), |
| | 24 | + array( 'src' => 'css/vector.expandableSearch.css', 'version' => 4 ), |
| 25 | 25 | array( 'src' => 'css/vector.footerCleanup.css', 'version' => 2 ), |
| 26 | 26 | array( 'src' => 'css/wikiEditor.css', 'version' => 14 ), |
| 27 | 27 | array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 29 ), |
| — | — | @@ -30,11 +30,11 @@ |
| 31 | 31 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
| 32 | 32 | ), |
| 33 | 33 | 'combined' => array( |
| 34 | | - array( 'src' => 'css/combined.css', 'version' => 102 ), |
| | 34 | + array( 'src' => 'css/combined.css', 'version' => 103 ), |
| 35 | 35 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
| 36 | 36 | ), |
| 37 | 37 | 'minified' => array( |
| 38 | | - array( 'src' => 'css/combined.min.css', 'version' => 102 ), |
| | 38 | + array( 'src' => 'css/combined.min.css', 'version' => 103 ), |
| 39 | 39 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
| 40 | 40 | ), |
| 41 | 41 | ) |
| — | — | @@ -72,7 +72,7 @@ |
| 73 | 73 | array( 'src' => 'js/plugins/jquery.cookie.js', 'version' => 4 ), |
| 74 | 74 | array( 'src' => 'js/plugins/jquery.delayedBind.js', 'version' => 1 ), |
| 75 | 75 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 18 ), |
| 76 | | - array( 'src' => 'js/plugins/jquery.expandableField.js', 'version' => 16 ), |
| | 76 | + array( 'src' => 'js/plugins/jquery.expandableField.js', 'version' => 17 ), |
| 77 | 77 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 22 ), |
| 78 | 78 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 35 ), |
| 79 | 79 | array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 193 ), |
| — | — | @@ -89,10 +89,10 @@ |
| 90 | 90 | array( 'src' => 'js/thirdparty/contentCollector.js', 'version' => 2 ), |
| 91 | 91 | ), |
| 92 | 92 | 'combined' => array( |
| 93 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 423 ), |
| | 93 | + array( 'src' => 'js/plugins.combined.js', 'version' => 424 ), |
| 94 | 94 | ), |
| 95 | 95 | 'minified' => array( |
| 96 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 423 ), |
| | 96 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 424 ), |
| 97 | 97 | ), |
| 98 | 98 | ), |
| 99 | 99 | ); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.expandableField.js |
| — | — | @@ -73,7 +73,9 @@ |
| 74 | 74 | // callback function for after collapse |
| 75 | 75 | 'afterCondense': function( context ) {}, |
| 76 | 76 | // callback function for after expand |
| 77 | | - 'afterExpand': function( context ) {} |
| | 77 | + 'afterExpand': function( context ) {}, |
| | 78 | + // Whether the field should expand to the left or the right -- defaults to left |
| | 79 | + 'expandToLeft': true |
| 78 | 80 | } |
| 79 | 81 | }; |
| 80 | 82 | } |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -5949,7 +5949,9 @@ |
| 5950 | 5950 | // callback function for after collapse |
| 5951 | 5951 | 'afterCondense': function( context ) {}, |
| 5952 | 5952 | // callback function for after expand |
| 5953 | | - 'afterExpand': function( context ) {} |
| | 5953 | + 'afterExpand': function( context ) {}, |
| | 5954 | + // Whether the field should expand to the left or the right -- defaults to left |
| | 5955 | + 'expandToLeft': true |
| 5954 | 5956 | } |
| 5955 | 5957 | }; |
| 5956 | 5958 | } |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -396,7 +396,7 @@ |
| 397 | 397 | $.fn.extend({delayedBind:function(timeout,event,data,callback){var encEvent=encodeEvent(event);return this.each(function(){var that=this;if(!($(this).data('_delayedBindBound-'+encEvent+'-'+timeout))){$(this).data('_delayedBindBound-'+encEvent+'-'+timeout,true);$(this).bind(event,function(){var timerID=$(this).data('_delayedBindTimerID-'+encEvent+'-'+timeout);if(typeof timerID!='undefined') |
| 398 | 398 | clearTimeout(timerID);timerID=setTimeout(function(){$(that).trigger('_delayedBind-'+encEvent+'-'+timeout);},timeout);$(this).data('_delayedBindTimerID-'+encEvent+'-'+timeout,timerID);});} |
| 399 | 399 | $(this).bind('_delayedBind-'+encEvent+'-'+timeout,data,callback);});},delayedBindCancel:function(timeout,event){var encEvent=encodeEvent(event);return this.each(function(){var timerID=$(this).data('_delayedBindTimerID-'+encEvent+'-'+timeout);if(typeof timerID!='undefined') |
| 400 | | -clearTimeout(timerID);});},delayedBindUnbind:function(timeout,event,callback){var encEvent=encodeEvent(event);return this.each(function(){$(this).unbind('_delayedBind-'+encEvent+'-'+timeout,callback);});}});})(jQuery);(function($){$.expandableField={expandField:function(e,context){context.config.beforeExpand.call(context.data.$field,context);context.data.$field.animate({'width':context.data.expandedWidth},'fast',function(){context.config.afterExpand.call(this,context);});},condenseField:function(e,context){context.config.beforeCondense.call(context.data.$field,context);context.data.$field.animate({'width':context.data.condensedWidth},'fast',function(){context.config.afterCondense.call(this,context);});},configure:function(context,property,value){switch(property){default:context.config[property]=value;break;}}};$.fn.expandableField=function(){var returnValue=null;var args=arguments;$(this).each(function(){var context=$(this).data('expandableField-context');if(context==null){context={config:{'beforeCondense':function(context){},'beforeExpand':function(context){},'afterCondense':function(context){},'afterExpand':function(context){}}};} |
| | 400 | +clearTimeout(timerID);});},delayedBindUnbind:function(timeout,event,callback){var encEvent=encodeEvent(event);return this.each(function(){$(this).unbind('_delayedBind-'+encEvent+'-'+timeout,callback);});}});})(jQuery);(function($){$.expandableField={expandField:function(e,context){context.config.beforeExpand.call(context.data.$field,context);context.data.$field.animate({'width':context.data.expandedWidth},'fast',function(){context.config.afterExpand.call(this,context);});},condenseField:function(e,context){context.config.beforeCondense.call(context.data.$field,context);context.data.$field.animate({'width':context.data.condensedWidth},'fast',function(){context.config.afterCondense.call(this,context);});},configure:function(context,property,value){switch(property){default:context.config[property]=value;break;}}};$.fn.expandableField=function(){var returnValue=null;var args=arguments;$(this).each(function(){var context=$(this).data('expandableField-context');if(context==null){context={config:{'beforeCondense':function(context){},'beforeExpand':function(context){},'afterCondense':function(context){},'afterExpand':function(context){},'expandToLeft':true}};} |
| 401 | 401 | if(args.length>0){if(typeof args[0]=='object'){for(var key in args[0]){$.expandableField.configure(context,key,args[0][key]);}}else if(typeof args[0]=='string'){if(args.length>1){$.expandableField.configure(context,args[0],args[1]);}else if(returnValue==null){returnValue=(args[0]in context.config?undefined:context.config[args[0]]);}}} |
| 402 | 402 | if(typeof context.data=='undefined'){context.data={'condensedWidth':$(this).width(),'expandedWidth':$(this).width()*2,'$field':$(this)};$(this).addClass('expandableField').focus(function(e){$.expandableField.expandField(e,context);}).delayedBind(250,'blur',function(e){$.expandableField.condenseField(e,context);});} |
| 403 | 403 | $(this).data('expandableField-context',context);});return returnValue!==null?returnValue:$(this);};})(jQuery);(function($){$.suggestions={cancel:function(context){if(context.data.timerID!=null){clearTimeout(context.data.timerID);} |