Changeset 5869 for trunk/TinyMCEPlugin

Timestamp:

12/29/09 08:16:25 (2 years ago)

Author:

PaulHarvey

Message:

Item2447: Merge fix for problems with heading, normal etc. formats from release branch. Still broken in IE6, will create a new task for that.

Location:

trunk/TinyMCEPlugin

Files:

• . (modified) (1 prop)
• data/System (modified) (1 prop)
• data/System/TinyMCEPlugin.txt (modified) (2 diffs, 1 prop)
• lib/Foswiki/Plugins/TinyMCEPlugin.pm (modified) (2 diffs)
• pub/System/TinyMCEPlugin/foswiki.js (modified) (1 prop)
• pub/System/TinyMCEPlugin/foswiki_src.js (modified) (1 prop)
• pub/System/TinyMCEPlugin/foswiki_tiny.js (modified) (1 prop)
• pub/System/TinyMCEPlugin/foswiki_tiny_src.js (modified) (1 prop)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons (modified) (1 prop)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/attach_error_autoinc.htm (modified) (1 prop)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin.js (modified) (1 diff)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin_src.js (modified) (1 diff)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage (modified) (1 prop)

trunk/TinyMCEPlugin/data/System/TinyMCEPlugin.txt

@@ -147 +147 @@
 
 ---++ Known Issues
-The Foswiki:Community.WysiwygTaskTeam is working hard on enhancements and reliability improvements to this plugin, unfortunately the following issues remain outstanding in this current release:
 
    * Applying formats such as Headings, Verbatim, Normal, etc:
-      * Not working in Safari and Google Chrome browsers unless the line to be formatted is selected by triple-clicking first
-      * Not working in Microsoft Internet Explorer 6
+      * In Microsoft Internet Explorer 6, not working at all.
+      * In Safari and Google Chrome, only works once (must move the cursor out of the formatted region and back again for each subsequent format change).
    * "Normal" format depends on WysiwygPlugin flattening <div> tags
 
-If you are affected, please check regularly for updates at Foswiki:Extensions.TinyMCEPlugin.
+Check regularly at Foswiki:Extensions.TinyMCEPlugin for updates.
 
 ---++ Plugin Info
@@ -167 +166 @@
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  07 Dec 2009 | Foswikitask:Item2447: Fix unable to apply "Normal" format in some browsers (notes added to System topic)<br/> Foswikitask:Item1462: Block attachments to unsaved AUTOINC topics |
+|  29 Dec 2009 | Foswikitask:Item2447: Fix unable to apply "Normal" format in some browsers (notes added to System topic)<br/> Foswikitask:Item1462: Block attachments to unsaved AUTOINC topics |
 |  25 Nov 2009 | Foswikitask:Item2412: Inserting images - fixed a problem where it wasn't easy (impossible unless > 1 attachments) to select the first image in the attachment list; improved layout of dialog window where preview obscures insert/cancel buttons. |
 |  09 Nov 2009 | Foswikitask:Item2341: Added blockquote button and rearranged toolbars slightly; cleaned up System topic |

trunk/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm

@@ -19 +19 @@
 
 our $VERSION           = '$Rev$';
-our $RELEASE           = '25 Nov 2009';
+our $RELEASE           = '29 Dec 2009';
 our $SHORTDESCRIPTION  = 'Integration of the Tiny MCE WYSIWYG Editor';
 our $NO_PREFS_IN_TOPIC = 1;
@@ -48 +48 @@
 theme_advanced_toolbar_align : "left",
 foswikibuttons_formats : [
-{ name: "Normal", el: "div", style: null },
+{ name: "Normal", el: 'div', style: null },
 { name: "Heading 1", el: "h1", style: null },
 { name: "Heading 2", el: "h2", style: null },

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin.js

@@ -3 +3 @@
 return;ed.windowManager.open({location:false,menubar:false,toolbar:false,status:false,url:url+'/colours.htm',width:240,height:140,movable:true,popup_css:false,inline:true},{plugin_url:url});});ed.addButton('colour',{title:'foswikibuttons.colour_desc',cmd:'foswikibuttonsColour',image:url+'/img/colour.gif'});ed.addCommand('foswikibuttonsAttach',function(){var htmpath='/attach.htm',htmheight=250;if(null!==FoswikiTiny.foswikiVars.TOPIC.match(/(X{10}|AUTOINC[0-9]+)/)){htmpath='/attach_error_autoinc.htm',htmheight=125;}
 ed.windowManager.open({location:false,menubar:false,toolbar:false,status:false,url:url+htmpath,width:350,height:htmheight,movable:true,inline:true},{plugin_url:url});});ed.addButton('attach',{title:'foswikibuttons.attach_desc',cmd:'foswikibuttonsAttach',image:url+'/img/attach.gif'});ed.addCommand('foswikibuttonsHide',function(){if(FoswikiTiny.saveEnabled){if(ed.getParam('fullscreen_is_enabled')){ed.onGetContent.add(function(){tinymce.DOM.win.setTimeout(function(){var e=tinyMCE.activeEditor;tinyMCE.execCommand("mceToggleEditor",true,e.id);FoswikiTiny.switchToRaw(e);},10);});ed.execCommand('mceFullScreen');}
-else{tinyMCE.execCommand("mceToggleEditor",true,ed.id);FoswikiTiny.switchToRaw(ed);}}});ed.addButton('hide',{title:'foswikibuttons.hide_desc',cmd:'foswikibuttonsHide',image:url+'/img/hide.gif'});ed.addCommand('foswikibuttonsFormat',function(ui,fn){var format=null;for(var i=0;i<ed.fw_formats.length;i++){if(ed.fw_formats[i].name==fn){format=ed.fw_formats[i];break;}}
-if(format.el!=null){var fmt=format.el;if(fmt.length)
-fmt='<'+fmt+'>';ed.execCommand('FormatBlock',false,fmt);if(format.el==''){var elm=ed.selection.getNode();ed.execCommand('removeformat',false,elm);}}
-if(format.style!=null){ed.execCommand('mceSetCSSClass',false,format.style);}
+else{tinyMCE.execCommand("mceToggleEditor",true,ed.id);FoswikiTiny.switchToRaw(ed);}}});ed.addButton('hide',{title:'foswikibuttons.hide_desc',cmd:'foswikibuttonsHide',image:url+'/img/hide.gif'});ed.addCommand('foswikibuttonsFormat',function(ui,fn){var format=null;for(var i=0;i<ed.fw_formats.length;i++){if(ed.fw_formats[i].name===fn){format=ed.fw_formats[i];break;}}
+if(format.el!==null){var fmt=format.el;ed.execCommand('FormatBlock',false,fmt);}
+if(format.style!==null){ed.execCommand('mceSetCSSClass',false,format.style);}
 ed.nodeChanged();});ed.onNodeChange.add(this._nodeChange,this);},getInfo:function(){return{longname:'Foswiki Buttons Plugin',author:'Crawford Currie',authorurl:'http://c-dot.co.uk',infourl:'http://c-dot.co.uk',version:2};},createControl:function(n,cm){if(n=='foswikiformat'){var ed=tinyMCE.activeEditor;var m=cm.createListBox(ed.id+'_'+n,{title:'Format',onselect:function(format){ed.execCommand('foswikibuttonsFormat',false,format);}});var formats=ed.getParam("foswikibuttons_formats");for(var i=0;i<formats.length;i++){m.add(formats[i].name,formats[i].name);}
 m.selectByIndex(0);ed.fw_lb=m;return m;}

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin_src.js

@@ -133 +133 @@
                 var format = null;
                 for (var i = 0; i < ed.fw_formats.length; i++) {
-                    if (ed.fw_formats[i].name == fn) {
+                    if (ed.fw_formats[i].name === fn) {
                         format = ed.fw_formats[i];
                         break;
                     }
                 }
-                if (format.el != null) {
-                    var fmt = format.el;
-                    if (fmt.length)
-                        fmt = '<' + fmt + '>';
-                    // SMELL: MIDAS command
-                    ed.execCommand('FormatBlock', false, fmt);
-                    if (format.el == '') {
+                if (format.el !== null) {
+                    ed.execCommand('FormatBlock', false, format.el);
+                    /* Item2447: We apply a <div> instead of null element
+                    if (format.el === '') {
                         var elm = ed.selection.getNode();
                         // SMELL: MIDAS command
                         ed.execCommand('removeformat', false, elm);
-                    }
-                }
-                if (format.style != null) {
+                    }*/
+                }
+                if (format.style !== null) {
                     // element is additionally styled
                     ed.execCommand('mceSetCSSClass', false,