| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:r59212 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/OptIn |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 2 | Merged /trunk/extensions/UsabilityInitiative/OptIn:r59212 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 3 | Merged /trunk/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:r59212 |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -67,15 +67,15 @@ |
| 68 | 68 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 6 ), |
| 69 | 69 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 18 ), |
| 70 | 70 | array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 14 ), |
| 71 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 23 ), |
| | 71 | + array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 24 ), |
| 72 | 72 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 8 ), |
| 73 | 73 | array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 27 ), |
| 74 | 74 | ), |
| 75 | 75 | 'combined' => array( |
| 76 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 67 ), |
| | 76 | + array( 'src' => 'js/plugins.combined.js', 'version' => 68 ), |
| 77 | 77 | ), |
| 78 | 78 | 'minified' => array( |
| 79 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 67 ), |
| | 79 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 68 ), |
| 80 | 80 | ), |
| 81 | 81 | ), |
| 82 | 82 | ); |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 83 | 83 | Merged /trunk/extensions/UsabilityInitiative/ClickTracking:r59212 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 84 | 84 | Merged /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:r59212 |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js |
| — | — | @@ -275,7 +275,7 @@ |
| 276 | 276 | var label = $.wikiEditor.autoMsg( tool, 'label' ); |
| 277 | 277 | switch ( tool.type ) { |
| 278 | 278 | case 'button': |
| 279 | | - var src = tool.icon; |
| | 279 | + var src = tool.icon + '?' + wgWikiEditorIconVersion; |
| 280 | 280 | if ( src.indexOf( 'http://' ) !== 0 && src.indexOf( 'https://' ) !== 0 ) { |
| 281 | 281 | src = $.wikiEditor.imgPath + 'toolbar/' + src; |
| 282 | 282 | } |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 283 | 283 | Merged /trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:r59212 |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -1915,7 +1915,7 @@ |
| 1916 | 1916 | var label = $.wikiEditor.autoMsg( tool, 'label' ); |
| 1917 | 1917 | switch ( tool.type ) { |
| 1918 | 1918 | case 'button': |
| 1919 | | - var src = tool.icon; |
| | 1919 | + var src = tool.icon + '?' + wgWikiEditorIconVersion; |
| 1920 | 1920 | if ( src.indexOf( 'http://' ) !== 0 && src.indexOf( 'https://' ) !== 0 ) { |
| 1921 | 1921 | src = $.wikiEditor.imgPath + 'toolbar/' + src; |
| 1922 | 1922 | } |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -121,7 +121,7 @@ |
| 122 | 122 | break;case'dialog':context.$textarea.wikiEditor('openDialog',{'dialog':action.module});break;default:break;}},buildGroup:function(context,id,group){var $group=$('<div />').attr({'class':'group group-'+id,'rel':id});var label=$.wikiEditor.autoMsg(group,'label');if(label){$group.append('<div class="label">'+label+'</div>')} |
| 123 | 123 | var empty=true;if('tools'in group){for(tool in group.tools){var tool=$.wikiEditor.modules.toolbar.fn.buildTool(context,tool,group.tools[tool]);if(tool){empty=false;$group.append(tool);}}} |
| 124 | 124 | return empty?null:$group;},buildTool:function(context,id,tool){if('filters'in tool){for(filter in tool.filters){if($(tool.filters[filter]).size()==0){return null;}}} |
| 125 | | -var label=$.wikiEditor.autoMsg(tool,'label');switch(tool.type){case'button':var src=tool.icon;if(src.indexOf('http://')!==0&&src.indexOf('https://')!==0){src=$.wikiEditor.imgPath+'toolbar/'+src;} |
| | 125 | +var label=$.wikiEditor.autoMsg(tool,'label');switch(tool.type){case'button':var src=tool.icon+'?'+wgWikiEditorIconVersion;if(src.indexOf('http://')!==0&&src.indexOf('https://')!==0){src=$.wikiEditor.imgPath+'toolbar/'+src;} |
| 126 | 126 | $button=$('<img />').attr({'src':src,'width':22,'height':22,'alt':label,'title':label,'rel':id,'class':'tool tool-button'});if('action'in tool){$button.data('action',tool.action).data('context',context).click(function(){$.wikiEditor.modules.toolbar.fn.doAction($(this).data('context'),$(this).data('action'),$(this));return false;});} |
| 127 | 127 | return $button;case'select':var $select=$('<div />').attr({'rel':id,'class':'tool tool-select'}).click(function(){var $options=$(this).find('.options');$options.animate({'opacity':'toggle'},'fast');});$options=$('<div />').addClass('options');if('list'in tool){for(option in tool.list){var optionLabel=$.wikiEditor.autoMsg(tool.list[option],'label');$options.append($('<a />').data('action',tool.list[option].action).data('context',context).click(function(){$.wikiEditor.modules.toolbar.fn.doAction($(this).data('context'),$(this).data('action'),$(this));}).text(optionLabel).addClass('option').attr('rel',option));}} |
| 128 | 128 | $select.append($('<div />').addClass('menu').append($options));$select.append($('<div />').addClass('label').text(label));return $select;default:return null;}},buildBookmark:function(context,id,page){var label=$.wikiEditor.autoMsg(page,'label');return $('<div />').text(label).attr('rel',id).data('context',context).bind('mousedown',function(){$(this).parent().parent().find('.page').hide();$(this).parent().parent().find('.page-'+$(this).attr('rel')).show();$(this).siblings().removeClass('current');$(this).addClass('current');var section=$(this).parent().parent().attr('rel');if($.trackAction!=undefined){$.trackAction(section+'.'+$(this).attr('rel'));} |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 129 | 129 | Merged /trunk/extensions/UsabilityInitiative:r59212 |