| Index: branches/wmf-deployment/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -64,15 +64,15 @@ |
| 65 | 65 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 9 ), |
| 66 | 66 | array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 5 ), |
| 67 | 67 | array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 11 ), |
| 68 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 2 ), |
| | 68 | + array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 3 ), |
| 69 | 69 | array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 6 ), |
| 70 | 70 | array( 'src' => 'js/js2/jquery-ui-1.7.2.js', 'version' => '1.7.2x' ), |
| 71 | 71 | ), |
| 72 | 72 | 'combined' => array( |
| 73 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 22 ), |
| | 73 | + array( 'src' => 'js/plugins.combined.js', 'version' => 23 ), |
| 74 | 74 | ), |
| 75 | 75 | 'minified' => array( |
| 76 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 22 ), |
| | 76 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 23 ), |
| 77 | 77 | ), |
| 78 | 78 | ), |
| 79 | 79 | ); |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 80 | 80 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646 |
| /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56207,56209,56226,56296,56333,56355,56417,56424,56426 |
| /trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 |
| 81 | 81 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646 |
| /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56207,56209,56226,56296,56333,56355,56417,56424,56426,56588,56590 |
| /trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/EditToolbar |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 82 | 82 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar:51646 |
| /trunk/extensions/UsabilityInitiative/EditToolbar:56207,56209,56296,56333,56355,56424,56426 |
| /trunk/phase3/extensions/UsabilityInitiative/EditToolbar:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 |
| 83 | 83 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar:51646 |
| /trunk/extensions/UsabilityInitiative/EditToolbar:56207,56209,56296,56333,56355,56424,56426,56588,56590 |
| /trunk/phase3/extensions/UsabilityInitiative/EditToolbar:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.dialogs.js |
| — | — | @@ -56,10 +56,10 @@ |
| 57 | 57 | // Transform messages in keys |
| 58 | 58 | // Stupid JS won't let us do stuff like |
| 59 | 59 | // foo = { gM ('bar'): baz } |
| 60 | | - for ( msg in configuration.buttons ) { |
| 61 | | - configuration.buttons[gM( msg )] = configuration.buttons[msg]; |
| 62 | | - delete configuration.buttons[msg]; |
| 63 | | - } |
| | 60 | + configuration.newButtons = {}; |
| | 61 | + for ( msg in configuration.buttons ) |
| | 62 | + configuration.newButtons[gM( msg )] = configuration.buttons[msg]; |
| | 63 | + configuration.buttons = configuration.newButtons; |
| 64 | 64 | // Create the dialog <div> |
| 65 | 65 | $( '<div /> ' ) |
| 66 | 66 | .attr( 'id', module.id ) |
| — | — | @@ -74,4 +74,4 @@ |
| 75 | 75 | }, |
| 76 | 76 | 'modules': {} |
| 77 | 77 | |
| 78 | | -}; } ) ( jQuery ); |
| \ No newline at end of file |
| | 78 | +}; } ) ( jQuery ); |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 79 | 79 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js:51646 |
| /trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js:56195,56207,56209,56296,56333,56355,56417 |
| /trunk/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 |
| 80 | 80 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js:51646 |
| /trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js:56195,56207,56209,56296,56333,56355,56417,56588,56590 |
| /trunk/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -1143,10 +1143,10 @@ |
| 1144 | 1144 | // Transform messages in keys |
| 1145 | 1145 | // Stupid JS won't let us do stuff like |
| 1146 | 1146 | // foo = { gM ('bar'): baz } |
| 1147 | | - for ( msg in configuration.buttons ) { |
| 1148 | | - configuration.buttons[gM( msg )] = configuration.buttons[msg]; |
| 1149 | | - delete configuration.buttons[msg]; |
| 1150 | | - } |
| | 1147 | + configuration.newButtons = {}; |
| | 1148 | + for ( msg in configuration.buttons ) |
| | 1149 | + configuration.newButtons[gM( msg )] = configuration.buttons[msg]; |
| | 1150 | + configuration.buttons = configuration.newButtons; |
| 1151 | 1151 | // Create the dialog <div> |
| 1152 | 1152 | $( '<div /> ' ) |
| 1153 | 1153 | .attr( 'id', module.id ) |
| — | — | @@ -1161,7 +1161,8 @@ |
| 1162 | 1162 | }, |
| 1163 | 1163 | 'modules': {} |
| 1164 | 1164 | |
| 1165 | | -}; } ) ( jQuery );/** |
| | 1165 | +}; } ) ( jQuery ); |
| | 1166 | +/** |
| 1166 | 1167 | * Toolbar module for wikiEditor |
| 1167 | 1168 | */ |
| 1168 | 1169 | ( function( $ ) { $.wikiEditor.modules.toolbar = { |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -73,8 +73,8 @@ |
| 74 | 74 | context.$textarea.scrollToCaretPosition(0);} |
| 75 | 75 | if(arguments.length>0&&typeof arguments[0]=='object'){context.api.addModule(context,arguments[0]);}else{arguments=$.makeArray(arguments);if(arguments.length>0){var call=arguments.shift();if(call in context.api){context.api[call](context,arguments[0]==undefined?{}:arguments[0]);}}} |
| 76 | 76 | return $(this).data('wikiEditor-context',context);};})(jQuery);RegExp.escape=function(s){return s.replace(/([.*+?^${}()|\/\\[\]])/g,'\\$1');};(function($){$.wikiEditor.modules.dialogs={api:{addDialog:function(context,data){$.wikiEditor.modules.dialogs.fn.create(context,{'modules':data})},openDialog:function(context,data){if(data.dialog in $.wikiEditor.modules.dialogs.modules){$('#'+$.wikiEditor.modules.dialogs.modules[data.dialog].id).dialog('open');}},closeDialog:function(context,data){if(data.dialog in $.wikiEditor.modules.dialogs.modules){$('#'+$.wikiEditor.modules.dialogs.modules[data.dialog].id).dialog('close');}}},fn:{create:function(context,config){for(module in config){$.wikiEditor.modules.dialogs.modules[module]=config[module];} |
| 77 | | -for(module in $.wikiEditor.modules.dialogs.modules){var module=$.wikiEditor.modules.dialogs.modules[module];if($('#'+module.id).size()==0){var configuration=module.dialog;configuration.bgiframe=true;configuration.autoOpen=false;configuration.modal=true;configuration.title=$.wikiEditor.autoMsg(module,'title');for(msg in configuration.buttons){configuration.buttons[gM(msg)]=configuration.buttons[msg];delete configuration.buttons[msg];} |
| 78 | | -$('<div /> ').attr('id',module.id).html(module.html).data('context',context).appendTo($('body')).each(module.init).dialog(configuration);}}}},'modules':{}};})(jQuery);(function($){$.wikiEditor.modules.toolbar={api:{addToToolbar:function(context,data){for(type in data){switch(type){case'sections':var $sections=context.modules.$toolbar.find('div.sections');var $tabs=context.modules.$toolbar.find('div.tabs');for(section in data[type]){if(section=='main'){context.modules.$toolbar.prepend($.wikiEditor.modules.toolbar.fn.buildSection(context,section,data[type][section]));continue;} |
| | 77 | +for(module in $.wikiEditor.modules.dialogs.modules){var module=$.wikiEditor.modules.dialogs.modules[module];if($('#'+module.id).size()==0){var configuration=module.dialog;configuration.bgiframe=true;configuration.autoOpen=false;configuration.modal=true;configuration.title=$.wikiEditor.autoMsg(module,'title');configuration.newButtons={};for(msg in configuration.buttons) |
| | 78 | +configuration.newButtons[gM(msg)]=configuration.buttons[msg];configuration.buttons=configuration.newButtons;$('<div /> ').attr('id',module.id).html(module.html).data('context',context).appendTo($('body')).each(module.init).dialog(configuration);}}}},'modules':{}};})(jQuery);(function($){$.wikiEditor.modules.toolbar={api:{addToToolbar:function(context,data){for(type in data){switch(type){case'sections':var $sections=context.modules.$toolbar.find('div.sections');var $tabs=context.modules.$toolbar.find('div.tabs');for(section in data[type]){if(section=='main'){context.modules.$toolbar.prepend($.wikiEditor.modules.toolbar.fn.buildSection(context,section,data[type][section]));continue;} |
| 79 | 79 | $sections.append($.wikiEditor.modules.toolbar.fn.buildSection(context,section,data[type][section]));$tabs.append($.wikiEditor.modules.toolbar.fn.buildTab(context,section,data[type][section]));} |
| 80 | 80 | break;case'groups':if(!('section'in data)){continue;} |
| 81 | 81 | var $section=context.modules.$toolbar.find('div[rel='+data.section+'].section');for(group in data[type]){$section.append($.wikiEditor.modules.toolbar.fn.buildGroup(context,group,data[type][group]));} |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 82 | 82 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
| /trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,56417 |
| /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 |
| 83 | 83 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
| /trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,56417,56588,56590 |
| /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 |