Changeset 3995

Timestamp:

05/30/09 18:25:11 (3 years ago)

Author:

MichaelTempest

Message:

Item1529: Make the "save enabled" status available to TMCE plugins, and make the foswikibuttons plugin check that status before switching to "wiki text"

Location:

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin

Files:

• foswiki_tiny.js (modified) (1 diff)
• foswiki_tiny_src.js (modified) (1 diff)
• tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin.js (modified) (1 diff)
• tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin_src.js (modified) (1 diff)

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

@@ -1 +1 @@
 var FoswikiTiny={foswikiVars:null,metaTags:null,tml2html:new Array(),html2tml:new Array(),getFoswikiVar:function(name){if(FoswikiTiny.foswikiVars==null){var sets=tinyMCE.activeEditor.getParam("foswiki_vars","");FoswikiTiny.foswikiVars=eval(sets);}
 return FoswikiTiny.foswikiVars[name];},expandVariables:function(url){for(var i in FoswikiTiny.foswikiVars){url=url.replace('%'+i+'%',FoswikiTiny.foswikiVars[i],'g');}
-return url;},enableSaveButton:function(enabled){var status=enabled?null:"disabled";var elm=document.getElementById("save");if(elm){elm.disabled=status;}
+return url;},saveEnabled:0,enableSaveButton:function(enabled){var status=enabled?null:"disabled";FoswikiTiny.saveEnabled=enabled?1:0;var elm=document.getElementById("save");if(elm){elm.disabled=status;}
 elm=document.getElementById("quietsave");if(elm){elm.disabled=status;}
 elm=document.getElementById("checkpoint");if(elm){elm.disabled=status;}

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

@@ -41 +41 @@
     },
 
+    saveEnabled: 0,
     enableSaveButton: function(enabled) {
         var status = enabled ? null : "disabled";
+        FoswikiTiny.saveEnabled = enabled ? 1 : 0;
         var elm = document.getElementById("save");
         if (elm) {

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(){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){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

@@ -87 +87 @@
 
             ed.addCommand('foswikibuttonsHide', function() {
-                tinyMCE.execCommand("mceToggleEditor", true, ed.id);
-                FoswikiTiny.switchToRaw(ed);
+                if (FoswikiTiny.saveEnabled) {
+                    tinyMCE.execCommand("mceToggleEditor", true, ed.id);
+                    FoswikiTiny.switchToRaw(ed);
+                }
             });