From deb30262a766df2886e2bad2a5612a1040b6b05d Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Mon, 10 Dec 2007 11:33:50 -0500
Subject: [PATCH] upgrade TinyMCE version to latest
---
program/js/tiny_mce/plugins/media/editor_plugin_src.js | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/program/js/tiny_mce/plugins/media/editor_plugin_src.js b/program/js/tiny_mce/plugins/media/editor_plugin_src.js
index 4478ebb..8bb7d5b 100644
--- a/program/js/tiny_mce/plugins/media/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/media/editor_plugin_src.js
@@ -1,5 +1,5 @@
/**
- * $Id: editor_plugin_src.js 275 2007-05-01 15:35:08Z spocke $
+ * $Id: editor_plugin_src.js 296 2007-08-21 10:36:35Z spocke $
*
* @author Moxiecode
* @copyright Copyright � 2004-2007, Moxiecode Systems AB, All rights reserved.
@@ -200,9 +200,8 @@
break;
}
- // Force absolute URL
- if (!tinyMCE.getParam("relative_urls"))
- pl.src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], pl.src);
+ // Convert the URL
+ pl.src = tinyMCE.convertURL(pl.src, null, true);
embedHTML = TinyMCE_MediaPlugin._getEmbed(ci, cb, mt, pl, attribs);
} else {
@@ -236,10 +235,8 @@
at = at.replace(/height:[^0-9]?[0-9]+%?[^0-9]?/g, "height:'" + attribs.height + "'");
// Force absolute URL
- if (!tinyMCE.getParam("relative_urls")) {
- pl.src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], pl.src);
- at = at.replace(new RegExp("src:'[^']*'", "g"), "src:'" + pl.src + "'");
- }
+ pl.src = tinyMCE.convertURL(pl.src, null, true);
+ at = at.replace(new RegExp("src:'[^']*'", "g"), "src:'" + pl.src + "'");
embedHTML = '<script type="text/javascript">' + s + '({' + at + '});</script>';
}
--
Gitblit v1.9.1