| Index: trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js |
| — | — | @@ -43,7 +43,6 @@ |
| 44 | 44 | version = $j.cookie( 'vector-nav-pref-version' ); |
| 45 | 45 | // If the cookie didn't exist, or the value is out of range, generate a new one and save it |
| 46 | 46 | if ( version == null ) { |
| 47 | | - console.log( version ); |
| 48 | 47 | // 50% of the people will get the new version |
| 49 | 48 | version = Math.round( Math.random() + 1 ); |
| 50 | 49 | $j.cookie( 'vector-nav-pref-version', version, { 'expires': 30, 'path': '/' } ); |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php |
| — | — | @@ -12,7 +12,7 @@ |
| 13 | 13 | |
| 14 | 14 | static $scripts = array( |
| 15 | 15 | 'raw' => array( |
| 16 | | - array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 21 ), |
| | 16 | + array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 22 ), |
| 17 | 17 | array( 'src' => 'Modules/CollapsibleTabs/CollapsibleTabs.js', 'version' => 8 ), |
| 18 | 18 | array( 'src' => 'Modules/ExpandableSearch/ExpandableSearch.js', 'version' => 3 ), |
| 19 | 19 | array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 8 ), |
| — | — | @@ -20,10 +20,10 @@ |
| 21 | 21 | array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 15 ), |
| 22 | 22 | ), |
| 23 | 23 | 'combined' => array( |
| 24 | | - array( 'src' => 'Vector.combined.js', 'version' => 44 ), |
| | 24 | + array( 'src' => 'Vector.combined.js', 'version' => 45 ), |
| 25 | 25 | ), |
| 26 | 26 | 'minified' => array( |
| 27 | | - array( 'src' => 'Vector.combined.min.js', 'version' => 44 ), |
| | 27 | + array( 'src' => 'Vector.combined.min.js', 'version' => 45 ), |
| 28 | 28 | ), |
| 29 | 29 | ); |
| 30 | 30 | static $modules = array( |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js |
| — | — | @@ -43,7 +43,6 @@ |
| 44 | 44 | version = $j.cookie( 'vector-nav-pref-version' ); |
| 45 | 45 | // If the cookie didn't exist, or the value is out of range, generate a new one and save it |
| 46 | 46 | if ( version == null ) { |
| 47 | | - console.log( version ); |
| 48 | 47 | // 50% of the people will get the new version |
| 49 | 48 | version = Math.round( Math.random() + 1 ); |
| 50 | 49 | $j.cookie( 'vector-nav-pref-version', version, { 'expires': 30, 'path': '/' } ); |
| Index: trunk/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 | var mod={'browsers':{'ltr':{'opera':[['>=',9.6]],'konqueror':[['>=',4.0]],'blackberry':false,'ipod':false,'iphone':false,'ps3':false},'rtl':{'opera':[['>=',9.6]],'konqueror':[['>=',4.0]],'blackberry':false,'ipod':false,'iphone':false,'ps3':false}}};if(!$j.wikiEditor.isSupported(mod)){return true;} |
| 5 | | -var version=1;if(wgCollapsibleNavForceNewVersion==true){version=2;}else{if(wgCollapsibleNavBucketTest==true){version=$j.cookie('vector-nav-pref-version');if(version==null){console.log(version);version=Math.round(Math.random()+1);$j.cookie('vector-nav-pref-version',version,{'expires':30,'path':'/'});}}} |
| | 5 | +var version=1;if(wgCollapsibleNavForceNewVersion==true){version=2;}else{if(wgCollapsibleNavBucketTest==true){version=$j.cookie('vector-nav-pref-version');if(version==null){version=Math.round(Math.random()+1);$j.cookie('vector-nav-pref-version',version,{'expires':30,'path':'/'});}}} |
| 6 | 6 | if(version==2){var limit=5;var threshold=3;$j('#p-lang ul').addClass('secondary').before('<ul class="primary"></ul>');var languages=['en','fr','de','es','pt','it','ru','ja','nl','pl','zh','sv','ar','tr','uk','fi','no','ca','ro','hu','ksh','id','he','cs','vi','ko','sr','fa','da','eo','sk','th','lt','vo','bg','sl','hr','hi','et','mk','simple','new','ms','nn','gl','el','eu','ka','tl','bn','lv','ml','bs','te','la','az','sh','war','br','is','mr','be-x-old','sq','cy','lb','ta','zh-classical','an','jv','ht','oc','bpy','ceb','ur','zh-yue','pms','scn','be','roa-rup','qu','af','sw','nds','fy','lmo','wa','ku','hy','su','yi','io','os','ga','ast','nap','vec','gu','cv','bat-smg','kn','uz','zh-min-nan','si','als','yo','li','gan','arz','sah','tt','bar','gd','tg','kk','pam','hsb','roa-tara','nah','mn','vls','gv','mi','am','ia','co','ne','fo','nds-nl','glk','mt','ang','wuu','dv','km','sco','bcl','mg','my','diq','tk','szl','ug','fiu-vro','sc','rm','nrm','ps','nv','hif','bo','se','sa','pnb','map-bms','lad','lij','crh','fur','kw','to','pa','jbo','ba','ilo','csb','wo','xal','krc','ckb','pag','ln','frp','mzn','ce','nov','kv','eml','gn','ky','pdc','lo','haw','mhr','dsb','stq','tpi','arc','hak','ie','so','bh','ext','mwl','sd','ig','myv','ay','iu','na','cu','pi','kl','ty','lbe','ab','got','sm','as','mo','ee','zea','av','ace','kg','bm','cdo','cbk-zam','kab','om','chr','pap','udm','ks','zu','rmy','cr','ch','st','ik','mdf','kaa','aa','fj','srn','tet','or','pnt','bug','ss','ts','pcd','pih','za','sg','lg','bxr','xh','ak','ha','bi','ve','tn','ff','dz','ti','ki','ny','rw','chy','tw','sn','tum','ng','rn','mh','ii','cho','hz','kr','ho','mus','kj'];var acceptLangCookie=$j.cookie('accept-language');if(acceptLangCookie!=null){if(acceptLangCookie!=''){languages=acceptLangCookie.split(',').concat(languages);}}else{$j.getJSON(wgScriptPath+'/api.php?action=query&meta=userinfo&uiprop=acceptlang&format=json',function(data){var langs=[];if(typeof data.query!='undefined'&&typeof data.query.userinfo!='undefined'&&typeof data.query.userinfo.acceptlang!='undefined'){for(var j=0;j<data.query.userinfo.acceptlang.length;j++){if(data.query.userinfo.acceptlang[j].q!=0){langs.push(data.query.userinfo.acceptlang[j]['*']);}}} |
| 7 | 7 | $j.cookie('accept-language',langs.join(','),{'path':'/','expires':30});});} |
| 8 | 8 | $primary=$j('#p-lang ul.primary');$secondary=$j('#p-lang ul.secondary');if($secondary.children().length<limit+threshold){limit+=threshold;} |
| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -72,10 +72,10 @@ |
| 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' => 15 ), |
| | 76 | + array( 'src' => 'js/plugins/jquery.expandableField.js', 'version' => 16 ), |
| 77 | 77 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 21 ), |
| 78 | 78 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 34 ), |
| 79 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 191 ), |
| | 79 | + array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 192 ), |
| 80 | 80 | array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 53 ), |
| 81 | 81 | array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 66 ), |
| 82 | 82 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 25 ), |
| — | — | @@ -86,13 +86,13 @@ |
| 87 | 87 | array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 5 ), |
| 88 | 88 | |
| 89 | 89 | // thirdparty javascript libraries we use |
| 90 | | - array( 'src' => 'js/thirdparty/contentCollector.js', 'version' => 1 ), |
| | 90 | + array( 'src' => 'js/thirdparty/contentCollector.js', 'version' => 2 ), |
| 91 | 91 | ), |
| 92 | 92 | 'combined' => array( |
| 93 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 419 ), |
| | 93 | + array( 'src' => 'js/plugins.combined.js', 'version' => 420 ), |
| 94 | 94 | ), |
| 95 | 95 | 'minified' => array( |
| 96 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 419 ), |
| | 96 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 420 ), |
| 97 | 97 | ), |
| 98 | 98 | ), |
| 99 | 99 | ); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.expandableField.js |
| — | — | @@ -73,7 +73,7 @@ |
| 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 | 78 | } |
| 79 | 79 | }; |
| 80 | 80 | } |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js |
| — | — | @@ -532,7 +532,6 @@ |
| 533 | 533 | |
| 534 | 534 | //now place the cursor at the end of pasted content |
| 535 | 535 | var restoreTo = cursorPos[1] + offset; |
| 536 | | - //console.log("CURSOR POS: " + cursorPos[1] + " offset: " + offset + " restoreTo: " + restoreTo ); |
| 537 | 536 | |
| 538 | 537 | context.fn.setSelection( { start: restoreTo, end: restoreTo } ); |
| 539 | 538 | |
| Index: trunk/extensions/UsabilityInitiative/js/thirdparty/contentCollector.js |
| — | — | @@ -196,7 +196,7 @@ |
| 197 | 197 | cc.collectContent = function(node, state) { |
| 198 | 198 | if (!state) { |
| 199 | 199 | state = { |
| 200 | | - flags : {/* name -> nesting counter */}, |
| | 200 | + flags : {/* name -> nesting counter */} |
| 201 | 201 | }; |
| 202 | 202 | } |
| 203 | 203 | var isBlock = isBlockElement(node); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -5834,7 +5834,7 @@ |
| 5835 | 5835 | // callback function for after collapse |
| 5836 | 5836 | 'afterCondense': function( context ) {}, |
| 5837 | 5837 | // callback function for after expand |
| 5838 | | - 'afterExpand': function( context ) {}, |
| | 5838 | + 'afterExpand': function( context ) {} |
| 5839 | 5839 | } |
| 5840 | 5840 | }; |
| 5841 | 5841 | } |
| — | — | @@ -7340,7 +7340,6 @@ |
| 7341 | 7341 | |
| 7342 | 7342 | //now place the cursor at the end of pasted content |
| 7343 | 7343 | var restoreTo = cursorPos[1] + offset; |
| 7344 | | - //console.log("CURSOR POS: " + cursorPos[1] + " offset: " + offset + " restoreTo: " + restoreTo ); |
| 7345 | 7344 | |
| 7346 | 7345 | context.fn.setSelection( { start: restoreTo, end: restoreTo } ); |
| 7347 | 7346 | |
| — | — | @@ -12048,7 +12047,7 @@ |
| 12049 | 12048 | cc.collectContent = function(node, state) { |
| 12050 | 12049 | if (!state) { |
| 12051 | 12050 | state = { |
| 12052 | | - flags : {/* name -> nesting counter */}, |
| | 12051 | + flags : {/* name -> nesting counter */} |
| 12053 | 12052 | }; |
| 12054 | 12053 | } |
| 12055 | 12054 | var isBlock = isBlockElement(node); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -391,7 +391,7 @@ |
| 392 | 392 | $.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') |
| 393 | 393 | clearTimeout(timerID);timerID=setTimeout(function(){$(that).trigger('_delayedBind-'+encEvent+'-'+timeout);},timeout);$(this).data('_delayedBindTimerID-'+encEvent+'-'+timeout,timerID);});} |
| 394 | 394 | $(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') |
| 395 | | -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){},}};} |
| | 395 | +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){}}};} |
| 396 | 396 | 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]]);}}} |
| 397 | 397 | 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);});} |
| 398 | 398 | $(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);} |
| — | — | @@ -833,7 +833,7 @@ |
| 834 | 834 | function _produceListMarker(state){} |
| 835 | 835 | function _startNewLine(state){if(state){var atBeginningOfLine=lines.textOfLine(lines.length()-1).length==0;if(atBeginningOfLine&&state.listType&&state.listType!='none'){_produceListMarker(state);}} |
| 836 | 836 | lines.startNew();} |
| 837 | | -cc.notifySelection=function(sel){if(sel){selection=sel;startPoint=selection.startPoint;endPoint=selection.endPoint;}};cc.collectContent=function(node,state){if(!state){state={flags:{},};} |
| | 837 | +cc.notifySelection=function(sel){if(sel){selection=sel;startPoint=selection.startPoint;endPoint=selection.endPoint;}};cc.collectContent=function(node,state){if(!state){state={flags:{}};} |
| 838 | 838 | var isBlock=isBlockElement(node);var isEmpty=_isEmpty(node,state);if(isBlock) |
| 839 | 839 | _ensureColumnZero(state);var startLine=lines.length()-1;_reachBlockPoint(node,0,state);if(dom.isNodeText(node)){var txt=dom.nodeValue(node);var rest='';var x=0;if(txt.length==0){if(startPoint&&node==startPoint.node){selStart=_pointHere(0,state);} |
| 840 | 840 | if(endPoint&&node==endPoint.node){selEnd=_pointHere(0,state);}} |