Changeset 3105

Timestamp:

03/15/09 11:48:30 (3 years ago)

Author:

CrawfordCurrie

Message:

Item930: recompressed the javascript

Location:

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin

Files:

• foswiki_tiny.js (modified) (2 diffs)
• tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin.js (modified) (1 diff)
• tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/attach.js (modified) (1 diff)
• tinymce/jscripts/tiny_mce/tiny_mce.js (modified) (1 diff)
• tinymce/jscripts/tiny_mce/tiny_mce_jquery.js (modified) (1 diff)
• tinymce/jscripts/tiny_mce/tiny_mce_prototype.js (modified) (1 diff)

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

@@ -1 @@
-var FoswikiTiny={foswikiVars:null,request: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);}
+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;},enableSave:function(enabled){var status=enabled?null:"disabled";var elm=document.getElementById("save");if(elm){elm.disabled=status;}
-elm=document.getElementById("preview");if(elm){elm.style.display='none';elm.disabled=status;}},transform:function(editor,handler,text,onReadyToSend,onReply,onFail){var url=FoswikiTiny.getFoswikiVar("SCRIPTURL");var suffix=FoswikiTiny.getFoswikiVar("SCRIPTSUFFIX");if(suffix==null)suffix='';url+="/rest"+suffix+"/WysiwygPlugin/"+handler;var path=FoswikiTiny.getFoswikiVar("WEB")+'.'
-+FoswikiTiny.getFoswikiVar("TOPIC");FoswikiTiny.request=new Object();if(tinymce.isIE){FoswikiTiny.request.req=new ActiveXObject("Microsoft.XMLHTTP");}else{FoswikiTiny.request.req=new XMLHttpRequest();}
-FoswikiTiny.request.editor=editor;FoswikiTiny.request.req.open("POST",url,true);FoswikiTiny.request.req.setRequestHeader("Content-type","application/x-www-form-urlencoded");var params="nocache="+encodeURIComponent((new Date()).getTime())
+elm=document.getElementById("preview");if(elm){elm.style.display='none';elm.disabled=status;}},transform:function(editor,handler,text,onSuccess,onFail){var url=FoswikiTiny.getFoswikiVar("SCRIPTURL");var suffix=FoswikiTiny.getFoswikiVar("SCRIPTSUFFIX");if(suffix==null)suffix='';url+="/rest"+suffix+"/WysiwygPlugin/"+handler;var path=FoswikiTiny.getFoswikiVar("WEB")+'.'
++FoswikiTiny.getFoswikiVar("TOPIC");tinymce.util.XHR.send({url:url,content_type:"application/x-www-form-urlencoded",type:"POST",data:"nocache="+encodeURIComponent((new Date()).getTime())
 +"&topic="+encodeURIComponent(path)
-+"&text="+encodeURIComponent(text);FoswikiTiny.request.req.setRequestHeader("Content-length",params.length);FoswikiTiny.request.req.onreadystatechange=function(){if(FoswikiTiny.request.req.readyState==4){if(FoswikiTiny.request.req.status==200){onReply();}else{onFail();}}};onReadyToSend();FoswikiTiny.request.req.send(params);},initialisedFromServer:false,setUpContent:function(editor_id,body,doc){if(FoswikiTiny.initialisedFromServer)return;var editor=tinyMCE.getInstanceById(editor_id);FoswikiTiny.switchToWYSIWYG(editor);FoswikiTiny.initialisedFromServer=true;},switchToRaw:function(inst){inst.triggerSave(false,true);var text=inst.oldTargetElement.value;for(var i=0;i<FoswikiTiny.html2tml.length;i++){var cb=FoswikiTiny.html2tml[i];text=cb.apply(inst,[inst,text]);}
-FoswikiTiny.transform(inst,"html2tml",text,function(){FoswikiTiny.enableSave(false);var te=FoswikiTiny.request.editor.oldTargetElement;te.value="Please wait... retrieving page from server";},function(){var te=FoswikiTiny.request.editor.oldTargetElement;var text=FoswikiTiny.request.req.responseText;te.value=text;FoswikiTiny.enableSave(true);},function(){var te=FoswikiTiny.request.editor.oldTargetElement;te.value="There was a problem retrieving the page: "
-+FoswikiTiny.request.req.statusText;});var eid=inst.editorId;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(){alert("Tacky7");tinymce.execCommand("mceToggleEditor",null,inst.editorId);return false;}
-var pel=inst.oldTargetElement.parentNode;pel.insertBefore(el,inst.oldTargetElement);}
-inst.oldTargetElement.onchange=function(){var inst=tinyMCE.getInstanceById(eid);inst.isNotDirty=false;return true;}},switchToWYSIWYG:function(editor){editor.getElement().onchange=null;FoswikiTiny.transform(editor,"tml2html",editor.getElement().value,function(){FoswikiTiny.enableSave(false);FoswikiTiny.request.editor=editor;editor.setContent("<span class='foswikiAlert'>Please wait... retrieving page from server.</span>");},function(){var text=FoswikiTiny.request.req.responseText;for(var i=0;i<FoswikiTiny.tml2html.length;i++){var cb=FoswikiTiny.tml2html[i];text=cb.apply(editor,[editor,text]);}
-FoswikiTiny.request.editor.setContent(text);FoswikiTiny.request.editor.isNotDirty=true;FoswikiTiny.enableSave(true);},function(){tinymce.setInnerHTML(FoswikiTiny.request.editor.getBody(),"<div class='foswikiAlert'>"
-+"There was a problem retrieving the page: "
-+FoswikiTiny.request.req.statusText+"</div>");});var id=editor.editorId+"_2WYSIWYG";var el=document.getElementById(id);if(el){el.style.display="none";}},saveCallback:function(editor_id,html,body){var editor=tinyMCE.getInstanceById(editor_id);for(var i=0;i<FoswikiTiny.html2tml.length;i++){var cb=FoswikiTiny.html2tml[i];html=cb.apply(editor,[editor,html]);}
++"&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;},switchToRaw:function(editor){var text=editor.getContent();for(var i=0;i<FoswikiTiny.html2tml.length;i++){var cb=FoswikiTiny.html2tml[i];text=cb.apply(editor,[editor,text]);}
+FoswikiTiny.enableSave(false);editor.getElement().value="Please wait... retrieving page from server.";FoswikiTiny.transform(editor,"html2tml",text,function(text,req,o){this.getElement().value=text;FoswikiTiny.enableSave(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(){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;}},switchToWYSIWYG:function(editor){editor.getElement().onchange=null;var text=editor.getElement().value;FoswikiTiny.enableSave(false);editor.setContent("<span class='foswikiAlert'>"
++"Please wait... retrieving page from server."
++"</span>");FoswikiTiny.transform(editor,"tml2html",text,function(text,req,o){for(var i=0;i<FoswikiTiny.tml2html.length;i++){var cb=FoswikiTiny.tml2html[i];text=cb.apply(this,[this,text]);}
+this.setContent(text);this.isNotDirty=true;FoswikiTiny.enableSave(true);},function(type,req,o){this.setContent("<div class='foswikiAlert'>"
++"There was a problem retrieving "
++o.url+": "
++type+" "+req.status+"</div>");});var id=editor.id+"_2WYSIWYG";var el=document.getElementById(id);if(el){el.style.display="none";}},saveCallback:function(editor_id,html,body){var editor=tinyMCE.getInstanceById(editor_id);for(var i=0;i<FoswikiTiny.html2tml.length;i++){var cb=FoswikiTiny.html2tml[i];html=cb.apply(editor,[editor,html]);}
 var secret_id=tinyMCE.activeEditor.getParam('foswiki_secret_id');if(secret_id!=null&&html.indexOf('<!--'+secret_id+'-->')==-1){html='<!--'+secret_id+'-->'+html;}
 return html;},convertLink:function(url,node,onSave){if(onSave==null)
@@ -22 +26 @@
 +FoswikiTiny.getFoswikiVar("TOPIC")+'/';url=base+url;}
 return url;},getMetaTag:function(inKey){if(FoswikiTiny.metaTags==null||FoswikiTiny.metaTags.length==0){var head=document.getElementsByTagName("META");head=head[0].parentNode.childNodes;FoswikiTiny.metaTags=new Array();for(var i=0;i<head.length;i++){if(head[i].tagName!=null&&head[i].tagName.toUpperCase()=='META'){FoswikiTiny.metaTags[head[i].name]=head[i].content;}}}
-return FoswikiTiny.metaTags[inKey];},install:function(){var tmce_init=FoswikiTiny.getMetaTag('TINYMCEPLUGIN_INIT');if(tmce_init!=null){eval("tinyMCE.init({"+unescape(tmce_init)+"});");return;}
-alert("Unable to install TinyMCE; <META name='TINYMCEPLUGIN_INIT' is missing");}};
+return FoswikiTiny.metaTags[inKey];},install:function(){var tmce_init=this.getMetaTag('TINYMCEPLUGIN_INIT');if(tmce_init!=null){eval("tinyMCE.init({"+unescape(tmce_init)+"});");return;}
+alert("Unable to install TinyMCE; <META name='TINYMCEPLUGIN_INIT' is missing");},getTopicPath:function(){return this.getFoswikiVar("WEB")+'.'+this.getFoswikiVar("TOPIC");},getScriptURL:function(script){var scripturl=this.getFoswikiVar("SCRIPTURL");var suffix=this.getFoswikiVar("SCRIPTSUFFIX");if(suffix==null)suffix='';return scripturl+"/"+script+suffix;},getRESTURL:function(fn){return this.getScriptURL('rest')+"/WysiwygPlugin/"+fn;},getListOfAttachments:function(onSuccess){var url=this.getRESTURL('attachments');var path=this.getTopicPath();var params="nocache="+encodeURIComponent((new Date()).getTime())
++"&topic="+encodeURIComponent(path);tinymce.util.XHR.send({url:url+"?"+params,type:"POST",content_type:"application/x-www-form-urlencoded",data:params,success:function(atts){if(atts!=null){onSuccess(eval(atts));}}});}};

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(){alert("Tacky8");ed.execCommand("mceToggleEditor",true);});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(){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/jscripts/attach.js

@@ -1 @@
-var AttachDlg={preInit:function(){tinyMCEPopup.requireLangPack();},init:function(ed){var scripturl=FoswikiTiny.getFoswikiVar("SCRIPTURL");var suffix=FoswikiTiny.getFoswikiVar("SCRIPTSUFFIX");if(suffix==null)suffix='';var url=scripturl+"/rest"+suffix+"/WysiwygPlugin/attachments";var path=FoswikiTiny.getFoswikiVar("WEB")+'.'
-+FoswikiTiny.getFoswikiVar("TOPIC");var params="nocache="+encodeURIComponent((new Date()).getTime())
-+"&topic="+encodeURIComponent(path);tinymce.util.XHR.send({url:url+"?"+params,success:function(atts){if(atts!=null){atts=eval(atts);var select=document.getElementById("attachments_select");for(var i=0;i<atts.length;i++){select.options[i]=new Option(atts[i].name,atts[i].name);}}}});var el=document.getElementById('upload_form');el.action=scripturl+"/rest"+suffix+
-"/WysiwygPlugin/upload";el=document.getElementById('upload_form_topic');el.value=path;tinyMCEPopup.resizeToInnerSize();},insertLink:function(){var inst=tinyMCE.activeEditor;var select=document.getElementById("attachments_select");var filename=select.value;var url=FoswikiTiny.getFoswikiVar("ATTACHURL")+'/'+filename;var tmp=filename.lastIndexOf(".");if(tmp>=0)
+var AttachDlg={preInit:function(){tinyMCEPopup.requireLangPack();},init:function(ed){FoswikiTiny.getListOfAttachments(function(atts){var select=document.getElementById("attachments_select");for(var i=0;i<atts.length;i++){select.options[i]=new Option(atts[i].name,atts[i].name);}});var el=document.getElementById('upload_form');el.action=FoswikiTiny.getRESTURL('upload');el=document.getElementById('upload_form_topic');el.value=FoswikiTiny.getTopicPath();tinyMCEPopup.resizeToInnerSize();},insertLink:function(){var inst=tinyMCE.activeEditor;var select=document.getElementById("attachments_select");var filename=select.value;var url=FoswikiTiny.getFoswikiVar("ATTACHURL")+'/'+filename;var tmp=filename.lastIndexOf(".");if(tmp>=0)
 tmp=filename.substring(tmp+1,filename.length).toLowerCase();var html;if(tmp=="jpg"||tmp=="gif"||tmp=="jpeg"||tmp=="png"||tmp=="bmp"){html="<img src='"+url+"' alt='"+filename+"'>";}else{html="<a href='"+url+"'>"+filename+"</a>";}
 inst.execCommand('mceInsertContent',false,html);inst.nodeChanged();tinyMCEPopup.close();}};AttachDlg.preInit();tinyMCEPopup.onInit.add(AttachDlg.init,AttachDlg);

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/tiny_mce.js

@@ -788 +788 @@
 new tinymce.Editor(v,t.settings).render();return true;case"mceAddFrameControl":w=v.window;w.tinyMCE=tinyMCE;w.tinymce=tinymce;tinymce.DOM.doc=w.document;tinymce.DOM.win=w;ed=new tinymce.Editor(v.element_id,v);ed.render();if(tinymce.isIE){function clr(){ed.destroy();w.detachEvent('onunload',clr);w=w.tinyMCE=w.tinymce=null;};w.attachEvent('onunload',clr);}
 v.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(ed)
-ed.remove();return true;case'mceToggleEditor':alert("Tacky1");if(!ed){t.execCommand('mceAddControl',0,v);return true;}
+ed.remove();return true;case'mceToggleEditor':if(!ed){t.execCommand('mceAddControl',0,v);return true;}
 if(ed.isHidden())
 ed.show();else

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/tiny_mce_jquery.js

@@ -698 +698 @@
 new tinymce.Editor(v,t.settings).render();return true;case"mceAddFrameControl":w=v.window;w.tinyMCE=tinyMCE;w.tinymce=tinymce;tinymce.DOM.doc=w.document;tinymce.DOM.win=w;ed=new tinymce.Editor(v.element_id,v);ed.render();if(tinymce.isIE){function clr(){ed.destroy();w.detachEvent('onunload',clr);w=w.tinyMCE=w.tinymce=null;};w.attachEvent('onunload',clr);}
 v.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(ed)
-ed.remove();return true;case'mceToggleEditor':alert("Tacky2");if(!ed){t.execCommand('mceAddControl',0,v);return true;}
+ed.remove();return true;case'mceToggleEditor':if(!ed){t.execCommand('mceAddControl',0,v);return true;}
 if(ed.isHidden())
 ed.show();else

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/tiny_mce_prototype.js

@@ -789 +789 @@
 new tinymce.Editor(v,t.settings).render();return true;case"mceAddFrameControl":w=v.window;w.tinyMCE=tinyMCE;w.tinymce=tinymce;tinymce.DOM.doc=w.document;tinymce.DOM.win=w;ed=new tinymce.Editor(v.element_id,v);ed.render();if(tinymce.isIE){function clr(){ed.destroy();w.detachEvent('onunload',clr);w=w.tinyMCE=w.tinymce=null;};w.attachEvent('onunload',clr);}
 v.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(ed)
-ed.remove();return true;case'mceToggleEditor':alert("Tacky3");if(!ed){t.execCommand('mceAddControl',0,v);return true;}
+ed.remove();return true;case'mceToggleEditor':if(!ed){t.execCommand('mceAddControl',0,v);return true;}
 if(ed.isHidden())
 ed.show();else