# HG changeset patch
# User Dan
# Date 1229894880 18000
# Node ID 57ce13805b6f1c6048847c1682c1775c23ba491a
# Parent 488665d49417c87304d4b2bbfa39be3007386393
Upgraded TinyMCE to version 3.2.1.1
diff -r 488665d49417 -r 57ce13805b6f includes/clientside/tinymce/plugins/advimage/js/image.js
--- a/includes/clientside/tinymce/plugins/advimage/js/image.js Sun Dec 21 15:35:46 2008 -0500
+++ b/includes/clientside/tinymce/plugins/advimage/js/image.js Sun Dec 21 16:28:00 2008 -0500
@@ -103,7 +103,7 @@
if (tinyMCEPopup.getParam("accessibility_warnings", 1)) {
if (!f.alt.value) {
- tinyMCEPopup.editor.windowManager.confirm(tinyMCEPopup.getLang('advimage_dlg.missing_alt'), function(s) {
+ tinyMCEPopup.confirm(tinyMCEPopup.getLang('advimage_dlg.missing_alt'), function(s) {
if (s)
t.insertAndClose();
});
diff -r 488665d49417 -r 57ce13805b6f includes/clientside/tinymce/plugins/advlink/js/advlink.js
--- a/includes/clientside/tinymce/plugins/advlink/js/advlink.js Sun Dec 21 15:35:46 2008 -0500
+++ b/includes/clientside/tinymce/plugins/advlink/js/advlink.js Sun Dec 21 16:28:00 2008 -0500
@@ -428,7 +428,6 @@
var target = getSelectValue(formObj, 'targetlist');
setAttrib(elm, 'href', href);
- setAttrib(elm, 'mce_href', href);
setAttrib(elm, 'title');
setAttrib(elm, 'target', target == '_self' ? '' : target);
setAttrib(elm, 'id');
@@ -464,7 +463,7 @@
function getSelectValue(form_obj, field_name) {
var elm = form_obj.elements[field_name];
- if (elm == null || elm.options == null)
+ if (!elm || elm.options == null || elm.selectedIndex == -1)
return "";
return elm.options[elm.selectedIndex].value;
diff -r 488665d49417 -r 57ce13805b6f includes/clientside/tinymce/plugins/fullpage/editor_plugin.js
--- a/includes/clientside/tinymce/plugins/fullpage/editor_plugin.js Sun Dec 21 15:35:46 2008 -0500
+++ b/includes/clientside/tinymce/plugins/fullpage/editor_plugin.js Sun Dec 21 16:28:00 2008 -0500
@@ -1,1 +1,1 @@
-(function(){tinymce.create('tinymce.plugins.FullPagePlugin',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceFullPageProperties',function(){ed.windowManager.open({file:url+'/fullpage.htm',width:430+parseInt(ed.getLang('fullpage.delta_width',0)),height:495+parseInt(ed.getLang('fullpage.delta_height',0)),inline:1},{plugin_url:url,head_html:t.head});});ed.addButton('fullpage',{title:'fullpage.desc',cmd:'mceFullPageProperties'});ed.onBeforeSetContent.add(t._setContent,t);ed.onSetContent.add(t._setBodyAttribs,t);ed.onGetContent.add(t._getContent,t);},getInfo:function(){return{longname:'Fullpage',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_setBodyAttribs:function(ed,o){var bdattr,i,len,kv,k,v,t,attr=this.head.match(/body(.*?)>/i);if(attr&&attr[1]){bdattr=attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);for(i=0,len=bdattr.length;i
\n';t.head+=ed.getParam('fullpage_default_doctype','');t.head+='\n\n
\n
\n';if(v=ed.getParam('fullpage_default_encoding'))t.head+='\n';if(v=ed.getParam('fullpage_default_font_family'))st+='font-family: '+v+';';if(v=ed.getParam('fullpage_default_font_size'))st+='font-size: '+v+';';if(v=ed.getParam('fullpage_default_text_color'))st+='color: '+v+';';t.head+='\n
\n