huge tiny_mce update - now using the tiny_mce jquery build which allows tiny_mce to be initialized via jquery - great!

6 files changed, 23 insertions, 23 deletions

diff --git a/public/javascripts/tiny_mce/plugins/advlink/css/advlink.css b/public/javascripts/tiny_mce/plugins/advlink/css/advlink.css
index 1436431..1436431 100755..100644
--- a/public/javascripts/tiny_mce/plugins/advlink/css/advlink.css
+++ b/public/javascripts/tiny_mce/plugins/advlink/css/advlink.css
diff --git a/public/javascripts/tiny_mce/plugins/advlink/editor_plugin.js b/public/javascripts/tiny_mce/plugins/advlink/editor_plugin.js
index 4899f7b..983fe5a 100755..100644
--- a/public/javascripts/tiny_mce/plugins/advlink/editor_plugin.js
+++ b/public/javascripts/tiny_mce/plugins/advlink/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create('tinymce.plugins.AdvancedLinkPlugin',{init:function(ed,url){this.editor=ed;ed.addCommand('mceAdvLink',function(){var se=ed.selection;if(se.isCollapsed()&&!ed.dom.getParent(se.getNode(),'A'))return;ed.windowManager.open({file:url+'/link.htm',width:480+parseInt(ed.getLang('advlink.delta_width',0)),height:400+parseInt(ed.getLang('advlink.delta_height',0)),inline:1},{plugin_url:url});});ed.addButton('link',{title:'advlink.link_desc',cmd:'mceAdvLink'});ed.addShortcut('ctrl+k','advlink.advlink_desc','mceAdvLink');ed.onNodeChange.add(function(ed,cm,n,co){cm.setDisabled('link',co&&n.nodeName!='A');cm.setActive('link',n.nodeName=='A'&&!n.name);});},getInfo:function(){return{longname:'Advanced link',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('advlink',tinymce.plugins.AdvancedLinkPlugin);})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AdvancedLinkPlugin",{init:function(a,b){this.editor=a;a.addCommand("mceAdvLink",function(){var c=a.selection;if(c.isCollapsed()&&!a.dom.getParent(c.getNode(),"A")){return}a.windowManager.open({file:b+"/link.htm",width:480+parseInt(a.getLang("advlink.delta_width",0)),height:400+parseInt(a.getLang("advlink.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("link",{title:"advlink.link_desc",cmd:"mceAdvLink"});a.addShortcut("ctrl+k","advlink.advlink_desc","mceAdvLink");a.onNodeChange.add(function(d,c,f,e){c.setDisabled("link",e&&f.nodeName!="A");c.setActive("link",f.nodeName=="A"&&!f.name)})},getInfo:function(){return{longname:"Advanced link",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlink",tinymce.plugins.AdvancedLinkPlugin)})();
\ No newline at end of file
diff --git a/public/javascripts/tiny_mce/plugins/advlink/editor_plugin_src.js b/public/javascripts/tiny_mce/plugins/advlink/editor_plugin_src.js
index fc5325a..fc5325a 100755..100644
--- a/public/javascripts/tiny_mce/plugins/advlink/editor_plugin_src.js
+++ b/public/javascripts/tiny_mce/plugins/advlink/editor_plugin_src.js
diff --git a/public/javascripts/tiny_mce/plugins/advlink/js/advlink.js b/public/javascripts/tiny_mce/plugins/advlink/js/advlink.js
index a896250..bb7922a 100755..100644
--- a/public/javascripts/tiny_mce/plugins/advlink/js/advlink.js
+++ b/public/javascripts/tiny_mce/plugins/advlink/js/advlink.js
@@ -116,7 +116,7 @@ function checkPrefix(n) {
         if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_email')))

                 n.value = 'mailto:' + n.value;

 

-        if (/^\s*www./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external')))

+        if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external')))

                 n.value = 'http://' + n.value;

 }

 

@@ -402,6 +402,7 @@ function insertAction() {
 

         // Create new anchor elements

         if (elm == null) {

+                inst.getDoc().execCommand("unlink", false, null);

                 tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});

 

                 elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});

diff --git a/public/javascripts/tiny_mce/plugins/advlink/langs/en_dlg.js b/public/javascripts/tiny_mce/plugins/advlink/langs/en_dlg.js
index c71ffbd..c71ffbd 100755..100644
--- a/public/javascripts/tiny_mce/plugins/advlink/langs/en_dlg.js
+++ b/public/javascripts/tiny_mce/plugins/advlink/langs/en_dlg.js
diff --git a/public/javascripts/tiny_mce/plugins/advlink/link.htm b/public/javascripts/tiny_mce/plugins/advlink/link.htm
index f46e8f8..cc8b0b8 100755..100644
--- a/public/javascripts/tiny_mce/plugins/advlink/link.htm
+++ b/public/javascripts/tiny_mce/plugins/advlink/link.htm
@@ -8,7 +8,6 @@
         <script type="text/javascript" src="../../utils/validate.js"></script>

         <script type="text/javascript" src="js/advlink.js"></script>

         <link href="css/advlink.css" rel="stylesheet" type="text/css" />

-        <base target="_self" />

 </head>

 <body id="advlink" style="display: none">

     <form onsubmit="insertAction();return false;" action="#">

@@ -28,7 +27,7 @@
 

                                         <table border="0" cellpadding="4" cellspacing="0">

                                                 <tr>

-                                                  <td nowrap="nowrap"><label id="hreflabel" for="href">{#advlink_dlg.url}</label></td>

+                                                  <td class="nowrap"><label id="hreflabel" for="href">{#advlink_dlg.url}</label></td>

                                                   <td><table border="0" cellspacing="0" cellpadding="0">

                                                                 <tr>

                                                                   <td><input id="href" name="href" type="text" class="mceFocus" value="" onchange="selectByValue(this.form,'linklisthref',this.value);" /></td>

@@ -38,25 +37,25 @@
                                                 </tr>

                                                 <tr id="linklisthrefrow">

                                                         <td class="column1"><label for="linklisthref">{#advlink_dlg.list}</label></td>

-                                                        <td colspan="2" id="linklisthrefcontainer">&nbsp;</td>

+                                                        <td colspan="2" id="linklisthrefcontainer"><select id="linklisthref"><option value=""></option></select></td>

                                                 </tr>

                                                 <tr>

                                                         <td class="column1"><label for="anchorlist">{#advlink_dlg.anchor_names}</label></td>

-                                                        <td colspan="2" id="anchorlistcontainer">&nbsp;</td>

+                                                        <td colspan="2" id="anchorlistcontainer"><select id="anchorlist"><option value=""></option></select></td>

                                                 </tr>

                                                 <tr>

                                                         <td><label id="targetlistlabel" for="targetlist">{#advlink_dlg.target}</label></td>

-                                                        <td id="targetlistcontainer">&nbsp;</td>

+                                                        <td id="targetlistcontainer"><select id="targetlist"><option value=""></option></select></td>

                                                 </tr>

                                                 <tr>

-                                                        <td nowrap="nowrap"><label id="titlelabel" for="title">{#advlink_dlg.titlefield}</label></td>

+                                                        <td class="nowrap"><label id="titlelabel" for="title">{#advlink_dlg.titlefield}</label></td>

                                                         <td><input id="title" name="title" type="text" value="" /></td>

                                                 </tr>

                                                 <tr>

                                                         <td><label id="classlabel" for="classlist">{#class_name}</label></td>

                                                         <td>

                                                                  <select id="classlist" name="classlist" onchange="changeClass();">

-                                                                        <option value="" selected>{#not_set}</option>

+                                                                        <option value="" selected="selected">{#not_set}</option>

                                                                  </select>

                                                         </td>

                                                 </tr>

@@ -73,7 +72,7 @@
 

                                         <table border="0" cellpadding="0" cellspacing="4">

                                                 <tr>

-                                                        <td nowrap="nowrap"><label for="popupurl">{#advlink_dlg.popup_url}</label>&nbsp;</td>

+                                                        <td class="nowrap"><label for="popupurl">{#advlink_dlg.popup_url}</label>&nbsp;</td>

                                                         <td>

                                                                 <table border="0" cellspacing="0" cellpadding="0">

                                                                         <tr>

@@ -84,19 +83,19 @@
                                                         </td>

                                                 </tr>

                                                 <tr>

-                                                        <td nowrap="nowrap"><label for="popupname">{#advlink_dlg.popup_name}</label>&nbsp;</td>

+                                                        <td class="nowrap"><label for="popupname">{#advlink_dlg.popup_name}</label>&nbsp;</td>

                                                         <td><input type="text" name="popupname" id="popupname" value="" onchange="buildOnClick();" /></td>

                                                 </tr>

                                                 <tr>

-                                                        <td nowrap="nowrap"><label>{#advlink_dlg.popup_size}</label>&nbsp;</td>

-                                                        <td nowrap="nowrap">

+                                                        <td class="nowrap"><label>{#advlink_dlg.popup_size}</label>&nbsp;</td>

+                                                        <td class="nowrap">

                                                                 <input type="text" id="popupwidth" name="popupwidth" value="" onchange="buildOnClick();" /> x

                                                                 <input type="text" id="popupheight" name="popupheight" value="" onchange="buildOnClick();" /> px

                                                         </td>

                                                 </tr>

                                                 <tr>

-                                                        <td nowrap="nowrap" id="labelleft"><label>{#advlink_dlg.popup_position}</label>&nbsp;</td>

-                                                        <td nowrap="nowrap">

+                                                        <td class="nowrap" id="labelleft"><label>{#advlink_dlg.popup_position}</label>&nbsp;</td>

+                                                        <td class="nowrap">

                                                                 <input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" /> /                                

                                                                 <input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" /> (c /c = center)

                                                         </td>

@@ -109,27 +108,27 @@
                                                 <table border="0" cellpadding="0" cellspacing="4">

                                                         <tr>

                                                                 <td><input type="checkbox" id="popuplocation" name="popuplocation" class="checkbox" onchange="buildOnClick();" /></td>

-                                                                <td nowrap="nowrap"><label id="popuplocationlabel" for="popuplocation">{#advlink_dlg.popup_location}</label></td>

+                                                                <td class="nowrap"><label id="popuplocationlabel" for="popuplocation">{#advlink_dlg.popup_location}</label></td>

                                                                 <td><input type="checkbox" id="popupscrollbars" name="popupscrollbars" class="checkbox" onchange="buildOnClick();" /></td>

-                                                                <td nowrap="nowrap"><label id="popupscrollbarslabel" for="popupscrollbars">{#advlink_dlg.popup_scrollbars}</label></td>

+                                                                <td class="nowrap"><label id="popupscrollbarslabel" for="popupscrollbars">{#advlink_dlg.popup_scrollbars}</label></td>

                                                         </tr>

                                                         <tr>

                                                                 <td><input type="checkbox" id="popupmenubar" name="popupmenubar" class="checkbox" onchange="buildOnClick();" /></td>

-                                                                <td nowrap="nowrap"><label id="popupmenubarlabel" for="popupmenubar">{#advlink_dlg.popup_menubar}</label></td>

+                                                                <td class="nowrap"><label id="popupmenubarlabel" for="popupmenubar">{#advlink_dlg.popup_menubar}</label></td>

                                                                 <td><input type="checkbox" id="popupresizable" name="popupresizable" class="checkbox" onchange="buildOnClick();" /></td>

-                                                                <td nowrap="nowrap"><label id="popupresizablelabel" for="popupresizable">{#advlink_dlg.popup_resizable}</label></td>

+                                                                <td class="nowrap"><label id="popupresizablelabel" for="popupresizable">{#advlink_dlg.popup_resizable}</label></td>

                                                         </tr>

                                                         <tr>

                                                                 <td><input type="checkbox" id="popuptoolbar" name="popuptoolbar" class="checkbox" onchange="buildOnClick();" /></td>

-                                                                <td nowrap="nowrap"><label id="popuptoolbarlabel" for="popuptoolbar">{#advlink_dlg.popup_toolbar}</label></td>

+                                                                <td class="nowrap"><label id="popuptoolbarlabel" for="popuptoolbar">{#advlink_dlg.popup_toolbar}</label></td>

                                                                 <td><input type="checkbox" id="popupdependent" name="popupdependent" class="checkbox" onchange="buildOnClick();" /></td>

-                                                                <td nowrap="nowrap"><label id="popupdependentlabel" for="popupdependent">{#advlink_dlg.popup_dependent}</label></td>

+                                                                <td class="nowrap"><label id="popupdependentlabel" for="popupdependent">{#advlink_dlg.popup_dependent}</label></td>

                                                         </tr>

                                                         <tr>

                                                                 <td><input type="checkbox" id="popupstatus" name="popupstatus" class="checkbox" onchange="buildOnClick();" /></td>

-                                                                <td nowrap="nowrap"><label id="popupstatuslabel" for="popupstatus">{#advlink_dlg.popup_statusbar}</label></td>

+                                                                <td class="nowrap"><label id="popupstatuslabel" for="popupstatus">{#advlink_dlg.popup_statusbar}</label></td>

                                                                 <td><input type="checkbox" id="popupreturn" name="popupreturn" class="checkbox" onchange="buildOnClick();" checked="checked" /></td>

-                                                                <td nowrap="nowrap"><label id="popupreturnlabel" for="popupreturn">{#advlink_dlg.popup_return}</label></td>

+                                                                <td class="nowrap"><label id="popupreturnlabel" for="popupreturn">{#advlink_dlg.popup_return}</label></td>

                                                         </tr>

                                                 </table>

                                         </fieldset>