Changeset 5005

Timestamp:

09/19/09 20:58:34 (2 years ago)

Author:

MichaelTempest

Message:

Item2037: When going from fullscreen to wikitext, delay transition to wikitext until after the fullscreen editor is closed. Thank you to PaulHarvey for clarifying the problem and providing most of the solution.

Location:

trunk/TinyMCEPlugin

Files:

• data/System/TinyMCEPlugin.txt (modified) (1 diff)
• pub/System/TinyMCEPlugin/foswiki_tiny_src.js (modified) (1 diff)
• 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) (12 diffs)

trunk/TinyMCEPlugin/data/System/TinyMCEPlugin.txt

@@ -136 +136 @@
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  19 Sep 2009 | Foswikitask:Item2037: Fix fullscreen-to-WikiText transition |
 |  18 Sep 2009 | Foswikitask:Item1798: Fixed a problem where editor wants to put text elements into blocks causing unwanted new lines. <br /> Foswikitask:Item1341: Fixed a problem so that editor does not convert TML lettered and roman numeral lists back to numbered lists. |
 |  03 Jul 2009 | Foswikitask:Item8178: Check that the help elements are present before hiding or showing them, as they are not present in all skins. |

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_tiny_src.js

@@ -121 +121 @@
         // Make the raw-edit help visible (still subject to toggle)
         var el = document.getElementById("foswikiTinyMcePluginWysiwygEditHelp");
-                if (el) {
-                        el.style.display = 'none';
-                }
+        if (el) {
+            el.style.display = 'none';
+        }
         el = document.getElementById("foswikiTinyMcePluginRawEditHelp");
-                if (el) {
-                        el.style.display = 'block';
-                }
+        if (el) {
+            el.style.display = 'block';
+        }
 
         // Evaluate post-processors attached from plugins

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

@@ -1 +1 @@
 (function(){tinymce.PluginManager.requireLangPack('foswikibuttons');tinymce.create('tinymce.plugins.FoswikiButtons',{formats_lb:null,init:function(ed,url){ed.fw_formats=ed.getParam("foswikibuttons_formats");ed.fw_lb=null;ed.addCommand('foswikibuttonsTT',function(){if(!ed.selection.isCollapsed())
 ed.execCommand('mceSetCSSClass',false,"WYSIWYG_TT");});ed.addButton('tt',{title:'foswikibuttons.tt_desc',cmd:'foswikibuttonsTT',image:url+'/img/tt.gif'});ed.addCommand('foswikibuttonsColour',function(){if(ed.selection.isCollapsed())
-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(){ed.windowManager.open({location:false,menubar:false,toolbar:false,status:false,url:url+'/attach.htm',width:350,height:250,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){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;}}
+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(){ed.windowManager.open({location:false,menubar:false,toolbar:false,status:false,url:url+'/attach.htm',width:350,height:250,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);}}

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

@@ -18 +18 @@
     tinymce.PluginManager.requireLangPack('foswikibuttons');
 
-        tinymce.create('tinymce.plugins.FoswikiButtons', {
+    tinymce.create('tinymce.plugins.FoswikiButtons', {
         formats_lb: null, // formats listbox
 
@@ -32 +32 @@
             });
 
-                        // Register buttons
-                        ed.addButton('tt', {
+            // Register buttons
+            ed.addButton('tt', {
                 title : 'foswikibuttons.tt_desc',
                 cmd : 'foswikibuttonsTT',
                 image: url + '/img/tt.gif'
-                        });
+            });
 
             ed.addCommand('foswikibuttonsColour', function() {
@@ -58 +58 @@
             });
 
-                        ed.addButton('colour', {
-                                title : 'foswikibuttons.colour_desc',
-                                cmd : 'foswikibuttonsColour',
+            ed.addButton('colour', {
+                title : 'foswikibuttons.colour_desc',
+                cmd : 'foswikibuttonsColour',
                 image: url + '/img/colour.gif'
-                        });
+            });
 
             ed.addCommand('foswikibuttonsAttach', function() {
@@ -81 +81 @@
 
             ed.addButton('attach', {
-                                title : 'foswikibuttons.attach_desc',
-                                cmd : 'foswikibuttonsAttach',
+                title : 'foswikibuttons.attach_desc',
+                cmd : 'foswikibuttonsAttach',
                 image: url + '/img/attach.gif'
-                        });
+            });
 
             ed.addCommand('foswikibuttonsHide', function() {
                 if (FoswikiTiny.saveEnabled) {
-                    tinyMCE.execCommand("mceToggleEditor", true, ed.id);
-                    FoswikiTiny.switchToRaw(ed);
-                }
-            });
-
-                        ed.addButton('hide', {
-                                title : 'foswikibuttons.hide_desc',
-                                cmd : 'foswikibuttonsHide',
+                    if (ed.getParam('fullscreen_is_enabled')) {
+                        // The fullscreen plugin does its work asynchronously, 
+                        // and it does not provide explicit hooks.
+                        // However, it does a getContent prior to closing the editor
+                        // which fires an onGetContent event.
+                        // Hook into that, and fire off further asynchronous handling
+                        // tht will be processed after the fullscreen editor is destroyed.
+                        ed.onGetContent.add(function(){
+                            tinymce.DOM.win.setTimeout(function() {
+                                // The fullscreen editor will have been destroyed
+                                // by the time this function executes,
+                                // so the active editor is the regular one.
+                                var e = tinyMCE.activeEditor;
+                                tinyMCE.execCommand("mceToggleEditor", true, e.id);
+                                FoswikiTiny.switchToRaw(e);
+                            }, 10);
+                        });
+
+                        // Call the full-screen toggle function to hide the fullscreen editor
+                        ed.execCommand('mceFullScreen');
+                    }
+                    else {
+                        // regular editor, not fullscreen
+                        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) {
@@ -127 +151 @@
             });
 
-                        ed.onNodeChange.add(this._nodeChange, this);
-                },
-
-                getInfo : function() {
-                        return {
+            ed.onNodeChange.add(this._nodeChange, this);
+        },
+
+        getInfo : function() {
+            return {
                     longname : 'Foswiki Buttons Plugin',
                     author : 'Crawford Currie',
@@ -137 +161 @@
                     infourl : 'http://c-dot.co.uk',
                     version : 2
-                        };
+            };
         },
 
-                createControl : function(n, cm) {
+        createControl : function(n, cm) {
             if (n == 'foswikiformat') {
                 var ed = tinyMCE.activeEditor;
@@ -158 +182 @@
                 return m;
             }
-                        return null;
-                },
+            return null;
+        },
 
         _nodeChange : function(ed, cm, n, co) {
-                if (n == null)
-                        return;
-
-                if (co) {
-                        // Disable the buttons
-                        cm.setDisabled('tt', true);
-                        cm.setDisabled('colour', true);
-                } else {
-                        // A selection means the buttons should be active.
-                        cm.setDisabled('tt', false);
-                        cm.setDisabled('colour', false);
-                }
+            if (n == null)
+                return;
+
+            if (co) {
+                // Disable the buttons
+                cm.setDisabled('tt', true);
+                cm.setDisabled('colour', true);
+            } else {
+                // A selection means the buttons should be active.
+                cm.setDisabled('tt', false);
+                cm.setDisabled('colour', false);
+            }
             var elm = ed.dom.getParent(n, '.WYSIWYG_TT');
             if (elm != null)
                 cm.setActive('tt', true);
-                        else
+            else
                 cm.setActive('tt', false);
             elm = ed.dom.getParent(n, '.WYSIWYG_COLOR');
             if (elm != null)
                 cm.setActive('colour', true);
-                        else
+            else
                 cm.setActive('colour', false);
 
@@ -207 +231 @@
                 }
             }
-                return true;
-
-        }
-        });
-
-        // Register plugin
-        tinymce.PluginManager.add('foswikibuttons',
+            return true;
+
+        }
+    });
+
+    // Register plugin
+    tinymce.PluginManager.add('foswikibuttons',
                               tinymce.plugins.FoswikiButtons);
 })();
@@ -222 +246 @@
 
 var FoswikiButtonsPlugin = {
-        getInfo : function() {
-                return {
-                        longname : 'Foswiki Buttons Plugin',
-                        author : 'Crawford Currie',
-                        authorurl : 'http://c-dot.co.uk',
-                        infourl : 'http://c-dot.co.uk',
-                        version : 1
-                };
-        },
-
-        initInstance : function(inst) {
-                //tinyMCE.importCSS(inst.getDoc(),
+    getInfo : function() {
+        return {
+            longname : 'Foswiki Buttons Plugin',
+            author : 'Crawford Currie',
+            authorurl : 'http://c-dot.co.uk',
+            infourl : 'http://c-dot.co.uk',
+            version : 1
+        };
+    },
+
+    initInstance : function(inst) {
+        //tinyMCE.importCSS(inst.getDoc(),
         //tinyMCE.baseURL + "/plugins/foswikibuttons/css/foswikibuttons.css");
-        },
-
-        getControlHTML : function(cn) {
+    },
+
+    getControlHTML : function(cn) {
         var html, formats;
-                switch (cn) {
+        switch (cn) {
         case "tt":
             return tinyMCE.getButtonHTML(cn, 'lang_foswikibuttons_tt_desc',
@@ -270 +294 @@
             
             return html;
-                }
-
-                return "";
-        },
-
-        execCommand : function(editor_id, element, command,
+        }
+
+        return "";
+    },
+
+    execCommand : function(editor_id, element, command,
                            user_interface, value) {
-                var em;
+        var em;
         var inst = tinyMCE.getInstanceById(editor_id);
 
-                switch (command) {
+        switch (command) {
         case "foswikiCOLOUR":
             var t = inst.selection.getSelectedText();
@@ -360 +384 @@
             tinyMCE.execCommand('mceEndUndoLevel');
            return true;
-                }
-
-                return false;
-        },
-
-        handleNodeChange : function(editor_id, node, undo_index,
+        }
+
+        return false;
+    },
+
+    handleNodeChange : function(editor_id, node, undo_index,
                                 undo_levels, visual_aid, any_selection) {
-                var elm = tinyMCE.getParentElement(node);
-
-                if (node == null)
-                        return;
-
-                if (!any_selection) {
-                        // Disable the buttons
-                        tinyMCE.switchClass(editor_id + '_tt', 'mceButtonDisable
+        var elm = tinyMCE.getParentElement(node);
+
+        if (node == null)
+            return;
+
+        if (!any_selection) {
+            // Disable the buttons
+            tinyMCE.switchClass(editor_id + '_tt', 'mceButtonDisable
 d');
-                        tinyMCE.switchClass(editor_id + '_colour', 'mceButtonDis
+            tinyMCE.switchClass(editor_id + '_colour', 'mceButtonDis
 abled');
-                } else {
-                        // A selection means the buttons should be active.
-                        tinyMCE.switchClass(editor_id + '_tt', 'mceButtonNormal'
+        } else {
+            // A selection means the buttons should be active.
+            tinyMCE.switchClass(editor_id + '_tt', 'mceButtonNormal'
 );
-                        tinyMCE.switchClass(editor_id + '_colour', 'mceButtonNor
+            tinyMCE.switchClass(editor_id + '_colour', 'mceButtonNor
 mal');
-                }
-
-                switch (node.nodeName) {
-                        case "TT":
+        }
+
+        switch (node.nodeName) {
+            case "TT":
             tinyMCE.switchClass(editor_id + '_tt', 'mceButtonSelected');
             return true;
-                }
-
-                var selectElm = document.getElementById(
+        }
+
+        var selectElm = document.getElementById(
             editor_id + "_foswikiFormatSelect");
         if (selectElm) {
@@ -418 +442 @@
             }
         }
-                return true;
-        }
+        return true;
+    }
 };