http://www.mediawiki.org/wiki/Special:Code/MediaWiki/66321
Revision: 66321
Author: catrope
Date: 2010-05-13 05:09:04 +0000 (Thu, 13 May 2010)
Log Message:
-----------
Fix r66286: another undeclared context var
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2010-05-13 00:31:31 UTC (rev 66320)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2010-05-13 05:09:04 UTC (rev 66321)
@@ -1512,6 +1512,7 @@
},
'wikieditor-toolbar-tool-reference-cancel':
function() {
// Clear any saved selection state
+ var context = $j( this ).data(
'context' );
context.fn.restoreStuffForIE();
$j( this ).dialog( 'close' );
}
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-05-13 00:31:31 UTC (rev 66320)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-05-13 05:09:04 UTC (rev 66321)
@@ -1561,6 +1561,7 @@
},
'wikieditor-toolbar-tool-reference-cancel':
function() {
// Clear any saved selection state
+ var context = $j( this ).data(
'context' );
context.fn.restoreStuffForIE();
$j( this ).dialog( 'close' );
}
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-05-13 00:31:31 UTC (rev 66320)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-05-13 05:09:04 UTC (rev 66321)
@@ -84,7 +84,7 @@
<input type="text" id="wikieditor-toolbar-reference-text" />\
</div>\
</div></fieldset>\
-
</div>',init:function(){$j(this).find('[rel]').each(function(){$j(this).text(mw.usability.getMsg($j(this).attr('rel')));});},dialog:{dialogClass:'wikiEditor-toolbar-dialog',width:590,buttons:{'wikieditor-toolbar-tool-reference-insert':function(){var
insertText=$j('#wikieditor-toolbar-reference-text').val();var
whitespace=$j('#wikieditor-toolbar-reference-dialog').data('whitespace');var
attributes=$j('#wikieditor-toolbar-reference-dialog').data('attributes');$j(this).dialog('close');$j.wikiEditor.modules.toolbar.fn.doAction($j(this).data('context'),{type:'replace',options:{pre:whitespace[0]+'<ref'+attributes+'>',peri:insertText,post:'</ref>'+whitespace[1]}},$j(this));$j('#wikieditor-toolbar-reference-text').val("");},'wikieditor-toolbar-tool-reference-cancel':function(){context.fn.restoreStuffForIE();$j(this).dialog('close');}},open:function(){var
context=$j(this).data('context');context.fn.restoreStuffForIE();context.fn.saveStuffForIE();var
selection=context.$textarea.textSelection('getSelection');$j('#wikieditor-toolbar-reference-text').focus();$j('#wikieditor-toolbar-reference-dialog').data('whitespace',['','']).data('attributes','');if(selection!=''){var
matches,text;if((matches=selection.match(/^(\s*)<ref([^\>]*)>([^\<]*)<\/ref\>(\s*)$/))){text=matches[3];$j('#wikieditor-toolbar-reference-dialog').data('whitespace',[matches[1],matches[4]]);$j('#wikieditor-toolbar-reference-dialog').data('attributes',matches[2]);}else{text=selection;}
+
</div>',init:function(){$j(this).find('[rel]').each(function(){$j(this).text(mw.usability.getMsg($j(this).attr('rel')));});},dialog:{dialogClass:'wikiEditor-toolbar-dialog',width:590,buttons:{'wikieditor-toolbar-tool-reference-insert':function(){var
insertText=$j('#wikieditor-toolbar-reference-text').val();var
whitespace=$j('#wikieditor-toolbar-reference-dialog').data('whitespace');var
attributes=$j('#wikieditor-toolbar-reference-dialog').data('attributes');$j(this).dialog('close');$j.wikiEditor.modules.toolbar.fn.doAction($j(this).data('context'),{type:'replace',options:{pre:whitespace[0]+'<ref'+attributes+'>',peri:insertText,post:'</ref>'+whitespace[1]}},$j(this));$j('#wikieditor-toolbar-reference-text').val("");},'wikieditor-toolbar-tool-reference-cancel':function(){var
context=$j(this).data('context');context.fn.restoreStuffForIE();$j(this).dialog('close');}},open:function(){var
context=$j(this).data('context');context.fn.restoreStuffForIE();context.fn.saveStuffForIE();var
selection=context.$textarea.textSelection('getSelection');$j('#wikieditor-toolbar-reference-text').focus();$j('#wikieditor-toolbar-reference-dialog').data('whitespace',['','']).data('attributes','');if(selection!=''){var
matches,text;if((matches=selection.match(/^(\s*)<ref([^\>]*)>([^\<]*)<\/ref\>(\s*)$/))){text=matches[3];$j('#wikieditor-toolbar-reference-dialog').data('whitespace',[matches[1],matches[4]]);$j('#wikieditor-toolbar-reference-dialog').data('attributes',matches[2]);}else{text=selection;}
$j('#wikieditor-toolbar-reference-text').val(text);}
if(!($j(this).data('dialogkeypressset'))){$j(this).data('dialogkeypressset',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode||e.which)==13){var
button=$j(this).data('dialogaction')||$j(this).find('button:first');button.click();e.preventDefault();}});$j(this).closest('.ui-dialog').find('button').focus(function(){$j(this).closest('.ui-dialog').data('dialogaction',this);});}}}},'insert-table':{filters:['#wpTextbox1.toolbar-dialogs'],titleMsg:'wikieditor-toolbar-tool-table-title',id:'wikieditor-toolbar-table-dialog',html:'\
<div class="wikieditor-toolbar-dialog-wrapper">\
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-05-13 00:31:31 UTC (rev 66320)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-05-13 05:09:04 UTC (rev 66321)
@@ -16,16 +16,16 @@
array( 'src' => 'Modules/Preview/Preview.js', 'version'
=> 6 ),
array( 'src' => 'Modules/Publish/Publish.js', 'version'
=> 6 ),
array( 'src' => 'Modules/Toc/Toc.js', 'version' => 7 ),
- array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 87 ),
+ array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 88 ),
array( 'src' =>
'Modules/TemplateEditor/TemplateEditor.js', 'version' => 6 ),
array( 'src' => 'Modules/Templates/Templates.js',
'version' => 1 ),
array( 'src' =>
'Modules/AddMediaWizard/AddMediaWizard.js', 'version' => 6 ),
),
'combined' => array(
- array( 'src' => 'WikiEditor.combined.js', 'version' =>
92 ),
+ array( 'src' => 'WikiEditor.combined.js', 'version' =>
93 ),
),
'minified' => array(
- array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 92 ),
+ array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 93 ),
),
);
static $messages = array(
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
