http://www.mediawiki.org/wiki/Special:Code/MediaWiki/66301
Revision: 66301
Author: tparscal
Date: 2010-05-12 21:08:47 +0000 (Wed, 12 May 2010)
Log Message:
-----------
Resolves regression caused in r66286 by not declaring the context var before
using it. Resolves bug #23493.
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-12 21:07:37 UTC (rev 66300)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2010-05-12 21:08:47 UTC (rev 66301)
@@ -1376,6 +1376,7 @@
},
'wikieditor-toolbar-tool-link-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-12 21:07:37 UTC (rev 66300)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-05-12 21:08:47 UTC (rev 66301)
@@ -1425,6 +1425,7 @@
},
'wikieditor-toolbar-tool-link-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-12 21:07:37 UTC (rev 66300)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-05-12 21:08:47 UTC (rev 66301)
@@ -68,7 +68,7 @@
insertText=escTarget;else if(text=='')
insertText='['+escTarget+']';else
insertText='['+escTarget+' '+escText+']';}
-if(whitespace)insertText=whitespace[0]+insertText+whitespace[1];$j(this).dialog('close');$j.wikiEditor.modules.toolbar.fn.doAction($j(this).data('context'),{type:'replace',options:{pre:insertText}},$j(this));$j('#wikieditor-toolbar-link-int-target,
#wikieditor-toolbar-link-int-text').val('');$j('#wikieditor-toolbar-link-type-int,
#wikieditor-toolbar-link-type-ext').attr('checked','');},'wikieditor-toolbar-tool-link-cancel':function(){context.fn.restoreStuffForIE();$j(this).dialog('close');}},open:function(){$j(this).data('articlePathRegex',new
RegExp('^'+RegExp.escape(wgServer+wgArticlePath).replace(/\\\$1/g,'(.*)')+'$'));var
context=$j(this).data('context');context.fn.restoreStuffForIE();context.fn.saveStuffForIE();var
selection=context.$textarea.textSelection('getSelection');$j('#wikieditor-toolbar-link-int-target').focus();$j('#wikieditor-toolbar-link-int-target').change();$j('#wikieditor-toolbar-link-dialog').data('whitespace',['','']);if(selection!=''){var
target,text,type;var
matches;if((matches=selection.match(/^(\s*)\[\[([^\]\|]+)(\|([^\]\|]*))?\]\](\s*)$/))){target=matches[2];text=(matches[4]?matches[4]:matches[2]);type='int';$j('#wikieditor-toolbar-link-dialog').data('whitespace',[matches[1],matches[5]]);}else
if((matches=selection.match(/^(\s*)\[([^\] ]+)(
([^\]]+))?\](\s*)$/))){target=matches[2];text=(matches[4]?matches[4]:'');type='ext';$j('#wikieditor-toolbar-link-dialog').data('whitespace',[matches[1],matches[5]]);}else{target=text=selection;}
+if(whitespace)insertText=whitespace[0]+insertText+whitespace[1];$j(this).dialog('close');$j.wikiEditor.modules.toolbar.fn.doAction($j(this).data('context'),{type:'replace',options:{pre:insertText}},$j(this));$j('#wikieditor-toolbar-link-int-target,
#wikieditor-toolbar-link-int-text').val('');$j('#wikieditor-toolbar-link-type-int,
#wikieditor-toolbar-link-type-ext').attr('checked','');},'wikieditor-toolbar-tool-link-cancel':function(){var
context=$j(this).data('context');context.fn.restoreStuffForIE();$j(this).dialog('close');}},open:function(){$j(this).data('articlePathRegex',new
RegExp('^'+RegExp.escape(wgServer+wgArticlePath).replace(/\\\$1/g,'(.*)')+'$'));var
context=$j(this).data('context');context.fn.restoreStuffForIE();context.fn.saveStuffForIE();var
selection=context.$textarea.textSelection('getSelection');$j('#wikieditor-toolbar-link-int-target').focus();$j('#wikieditor-toolbar-link-int-target').change();$j('#wikieditor-toolbar-link-dialog').data('whitespace',['','']);if(selection!=''){var
target,text,type;var
matches;if((matches=selection.match(/^(\s*)\[\[([^\]\|]+)(\|([^\]\|]*))?\]\](\s*)$/))){target=matches[2];text=(matches[4]?matches[4]:matches[2]);type='int';$j('#wikieditor-toolbar-link-dialog').data('whitespace',[matches[1],matches[5]]);}else
if((matches=selection.match(/^(\s*)\[([^\] ]+)(
([^\]]+))?\](\s*)$/))){target=matches[2];text=(matches[4]?matches[4]:'');type='ext';$j('#wikieditor-toolbar-link-dialog').data('whitespace',[matches[1],matches[5]]);}else{target=text=selection;}
if(typeof text!='undefined')
$j('#wikieditor-toolbar-link-int-text').val(text).change();if(typeof
target!='undefined')
$j('#wikieditor-toolbar-link-int-target').val(target).change();if(typeof
type!='undefined')
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-05-12 21:07:37 UTC (rev 66300)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-05-12 21:08:47 UTC (rev 66301)
@@ -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'
=> 86 ),
+ array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 87 ),
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' =>
91 ),
+ array( 'src' => 'WikiEditor.combined.js', 'version' =>
92 ),
),
'minified' => array(
- array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 91 ),
+ array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 92 ),
),
);
static $messages = array(
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
