Changeset 4086

Timestamp:

06/10/09 18:55:26 (3 years ago)

Author:

MichaelTempest

Message:

Item8178: Check that the help elements are present before hiding or showing them, as they are not present in all skins.

Location:

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin

Files:

• foswiki_tiny.js (modified) (1 diff)
• foswiki_tiny_src.js (modified) (2 diffs)

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_tiny.js

@@ -8 +8 @@
 +"&topic="+encodeURIComponent(path)
 +"&text="+encodeURIComponent(text),async:true,scope:editor,success:onSuccess,error:onFail})},initialisedFromServer:false,setUpContent:function(editor_id,body,doc){if(FoswikiTiny.initialisedFromServer)return;var editor=tinyMCE.getInstanceById(editor_id);FoswikiTiny.switchToWYSIWYG(editor);FoswikiTiny.initialisedFromServer=true;},cleanBeforeSave:function(eid,buttonId){var el=document.getElementById(buttonId);if(el==null)
-return;el.onclick=function(){var editor=tinyMCE.getInstanceById(eid);editor.isNotDirty=true;return true;}},onSubmitHandler:false,switchToRaw:function(editor){var text=editor.getContent();document.getElementById("foswikiTinyMcePluginWysiwygEditHelp").style.display='none';document.getElementById("foswikiTinyMcePluginRawEditHelp").style.display='block';for(var i=0;i<FoswikiTiny.html2tml.length;i++){var cb=FoswikiTiny.html2tml[i];text=cb.apply(editor,[editor,text]);}
+return;el.onclick=function(){var editor=tinyMCE.getInstanceById(eid);editor.isNotDirty=true;return true;}},onSubmitHandler:false,switchToRaw:function(editor){var text=editor.getContent();var el=document.getElementById("foswikiTinyMcePluginWysiwygEditHelp");if(1){el.style.display='none';}
+el=document.getElementById("foswikiTinyMcePluginRawEditHelp");if(el){el.style.display='block';}
+for(var i=0;i<FoswikiTiny.html2tml.length;i++){var cb=FoswikiTiny.html2tml[i];text=cb.apply(editor,[editor,text]);}
 FoswikiTiny.enableSaveButton(false);editor.getElement().value="Please wait... retrieving page from server.";FoswikiTiny.transform(editor,"html2tml",text,function(text,req,o){this.getElement().value=text;FoswikiTiny.enableSaveButton(true);},function(type,req,o){this.setContent("<div class='foswikiAlert'>"
 +"There was a problem retrieving "
 +o.url+": "
-+type+" "+req.status+"</div>");});var eid=editor.id;var id=eid+"_2WYSIWYG";var el=document.getElementById(id);if(el){el.style.display="block";}else{el=document.createElement('INPUT');el.id=id;el.type="button";el.value="WYSIWYG";el.className="foswikiButton";el.onclick=function(){document.getElementById("foswikiTinyMcePluginWysiwygEditHelp").style.display='block';document.getElementById("foswikiTinyMcePluginRawEditHelp").style.display='none';tinyMCE.execCommand("mceToggleEditor",null,eid);FoswikiTiny.switchToWYSIWYG(editor);return false;}
++type+" "+req.status+"</div>");});var eid=editor.id;var id=eid+"_2WYSIWYG";var el=document.getElementById(id);if(el){el.style.display="block";}else{el=document.createElement('INPUT');el.id=id;el.type="button";el.value="WYSIWYG";el.className="foswikiButton";el.onclick=function(){var el=document.getElementById("foswikiTinyMcePluginWysiwygEditHelp");if(el){el.style.display='block';}
+el=document.getElementById("foswikiTinyMcePluginRawEditHelp");if(el){el.style.display='none';}
+tinyMCE.execCommand("mceToggleEditor",null,eid);FoswikiTiny.switchToWYSIWYG(editor);return false;}
 var pel=editor.getElement().parentNode;pel.insertBefore(el,editor.getElement());}
 editor.getElement().onchange=function(){var editor=tinyMCE.getInstanceById(eid);editor.isNotDirty=false;return true;},this.onSubmitHandler=function(ed,e){editor.initialized=false;};editor.onSubmit.addToTop(this.onSubmitHandler);FoswikiTiny.cleanBeforeSave(eid,"save");FoswikiTiny.cleanBeforeSave(eid,"quietsave");FoswikiTiny.cleanBeforeSave(eid,"checkpoint");FoswikiTiny.cleanBeforeSave(eid,"preview");FoswikiTiny.cleanBeforeSave(eid,"cancel");},switchToWYSIWYG:function(editor){editor.getElement().onchange=null;var text=editor.getElement().value;if(this.onSubmitHandler){editor.onSubmit.remove(this.onSubmitHandler);this.onSubmitHandler=null;}

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

@@ -120 +120 @@
 
         // Make the raw-edit help visible (still subject to toggle)
-        document.getElementById("foswikiTinyMcePluginWysiwygEditHelp").style.display = 'none';
-        document.getElementById("foswikiTinyMcePluginRawEditHelp").style.display = 'block';
+        var el = document.getElementById("foswikiTinyMcePluginWysiwygEditHelp");
+                if (1) {
+                        el.style.display = 'none';
+                }
+        el = document.getElementById("foswikiTinyMcePluginRawEditHelp");
+                if (el) {
+                        el.style.display = 'block';
+                }
 
         // Evaluate post-processors attached from plugins
@@ -160 +166 @@
             el.onclick = function () {
                 // Make the wysiwyg help visible (still subject to toggle)
-                document.getElementById("foswikiTinyMcePluginWysiwygEditHelp").style.display = 'block';
-                document.getElementById("foswikiTinyMcePluginRawEditHelp").style.display = 'none';
+                var el = document.getElementById("foswikiTinyMcePluginWysiwygEditHelp");
+                if (el) {
+                    el.style.display = 'block';
+                }
+                el = document.getElementById("foswikiTinyMcePluginRawEditHelp");
+                if (el) {
+                    el.style.display = 'none';
+                }
                 tinyMCE.execCommand("mceToggleEditor", null, eid);
                 FoswikiTiny.switchToWYSIWYG(editor);