Index: /MediaWiki/trunk/extensions/FCKeditor/fckeditor_config.js =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/fckeditor_config.js (revision 552) +++ /MediaWiki/trunk/extensions/FCKeditor/fckeditor_config.js (revision 553) @@ -13,4 +13,5 @@ ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'], ['SpecialChar','Table','Image','Rule'], + ['MW_Template'], '/', ['FontFormat'], Index: diaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/fck_link.html =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/fck_link.html (revision 552) +++ (revision ) @@ -1,231 +1,0 @@ - - - - - Link Properties - - - - - - -
-
- Link
- -
- Automatic search results (start typing in the above field)
- -
-
- - Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/link.html =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/link.html (revision 553) +++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/link.html (revision 553) @@ -0,0 +1,231 @@ + + + + + Link Properties + + + + + + +
+
+ Link
+ +
+ Automatic search results (start typing in the above field)
+ +
+
+ + Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/template.html =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/template.html (revision 552) +++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/template.html (revision 553) @@ -70,5 +70,5 @@ if ( !oTemplateSpan ) return ; - GetE('xTemplateRaw').value = oTemplateSpan.innerHTML ; + GetE('xTemplateRaw').value = FCKTools.HTMLDecode( oTemplateSpan.innerHTML ).replace( /"/g, '"' ) ; } @@ -76,43 +76,26 @@ function Ok() { - var sUri = GetE('txtUrl').value ; - var sInnerHtml ; + if ( !oTemplateSpan ) + { + oTemplateSpan = FCK.EditorDocument.createElement( 'SPAN' ) ; + oTemplateSpan.className = 'fck_mw_template' ; + } + + var templateData = FCKTools.HTMLEncode( GetE('xTemplateRaw').value ).Trim().replace( /"/g, '"' ) ; + + if ( !( /^{{[\s\S]+}}$/.test( templateData ) ) ) + { + alert( 'Templates must start with {{ and end with }}. Please check it.' ) ; + return false ; + } + + oTemplateSpan.innerHTML = templateData ; - // If no link is selected, create a new one (it may result in more than one link creation - #220). - var aLinks = oLink ? [ oLink ] : oEditor.FCK.CreateLink( sUri ) ; - - // If no selection, no links are created, so use the uri as the link text (by dom, 2006-05-26) - var aHasSelection = ( aLinks.length > 0 ) ; - if ( !aHasSelection ) + if ( !oFakeImage ) { - sInnerHtml = sUri; - - var oLinkPathRegEx = new RegExp("//?([^?\"']+)([?].*)?$") ; - var asLinkPath = oLinkPathRegEx.exec( sUri ) ; - if (asLinkPath != null) - sInnerHtml = asLinkPath[1]; // use matched path - - // Create a new (empty) anchor. - aLinks = [ oEditor.FCK.InsertElement( 'a' ) ] ; + oFakeImage = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__MWTemplate', oTemplateSpan ) ; + oFakeImage.setAttribute( '_fck_mw_template', 'true', 0 ) ; + oFakeImage = FCK.InsertElement( oFakeImage ) ; } - - oEditor.FCKUndo.SaveUndoStep() ; - - for ( var i = 0 ; i < aLinks.length ; i++ ) - { - oLink = aLinks[i] ; - - if ( aHasSelection ) - sInnerHtml = oLink.innerHTML ; // Save the innerHTML (IE changes it if it is like an URL). - - oLink.href = sUri ; - SetAttribute( oLink, '_fcksavedurl', sUri ) ; - - oLink.innerHTML = sInnerHtml ; // Set (or restore) the innerHTML - - } - - // Select the (first) link. - oEditor.FCKSelection.SelectNode( aLinks[0] ); return true ; Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js (revision 552) +++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js (revision 553) @@ -29,8 +29,13 @@ FCKToolbarItems.RegisterItem( 'Source', new FCKToolbarButton( 'Source', 'Wikitext', null, FCK_TOOLBARITEM_ICONTEXT, true, true, 1 ) ) ; +// Register our toolbar buttons. +var tbButton = new FCKToolbarButton( 'MW_Template', 'Template', 'Insert/Edit Template' ) ; +tbButton.IconPath = FCKConfig.PluginsPath + 'mediawiki/images/tb_icon_template.gif' ; +FCKToolbarItems.RegisterItem( 'MW_Template', tbButton ) ; + // Override some dialogs. -FCKCommands.RegisterCommand( 'Link', new FCKDialogCommand( 'Link', FCKLang.DlgLnkWindowTitle, FCKConfig.PluginsPath + 'mediawiki/dialogs/fck_link.html', 400, 330 ) ) ; +FCKCommands.RegisterCommand( 'Link', new FCKDialogCommand( 'Link', FCKLang.DlgLnkWindowTitle, FCKConfig.PluginsPath + 'mediawiki/dialogs/link.html', 400, 330 ) ) ; FCKCommands.RegisterCommand( 'MW_Template', new FCKDialogCommand( 'MW_Template', 'Template Properties', FCKConfig.PluginsPath + 'mediawiki/dialogs/template.html', 400, 330 ) ) ; -//FCKCommands.RegisterCommand( 'Image', new FCKDialogCommand( 'Image', FCKLang.DlgImgTitle, FCKConfig.PluginsPath + 'mediawiki/fck_image.html', 450, 400 ) ) ; +//FCKCommands.RegisterCommand( 'Image', new FCKDialogCommand( 'Image', FCKLang.DlgImgTitle, FCKConfig.PluginsPath + 'mediawiki/image.html', 450, 400 ) ) ; // MediaWiki Wikitext Data Processor implementation. @@ -279,8 +284,10 @@ case 'span' : - if ( htmlNode.className == 'fck_mw_template' ) + switch ( htmlNode.className ) { - stringBuilder.push( htmlNode.innerHTML ) ; - return ; + case 'fck_mw_template' : + case 'fck_mw_magic' : + stringBuilder.push( htmlNode.innerHTML ) ; + return ; } @@ -303,16 +310,5 @@ } -// var oNode = this._CreateNode( sNodeName ) ; - - // Add all attributes. -// FCKXHtml._AppendAttributes( xmlNode, htmlNode, oNode, sNodeName ) ; - htmlNode._fckxhtmljob = FCKXHtml.CurrentJobNum ; - - // Tag specific processing. -// var oTagProcessor = FCKXHtml.TagProcessors[ sNodeName ] ; - -// if ( oTagProcessor ) -// oNode = oTagProcessor( oNode, htmlNode, xmlNode ) ; return ;