diff options
author | svncommit <devs@roundcube.net> | 2007-12-10 16:33:50 +0000 |
---|---|---|
committer | svncommit <devs@roundcube.net> | 2007-12-10 16:33:50 +0000 |
commit | deb30262a766df2886e2bad2a5612a1040b6b05d (patch) | |
tree | 05c9d12fb69f24b21bfbc252fb49984fd44be53e /program/js/tiny_mce/plugins/media/editor_plugin_src.js | |
parent | fba1f5ab813f2eb4bedc5d9c4a75e77bbaa90131 (diff) |
upgrade TinyMCE version to latest
Diffstat (limited to 'program/js/tiny_mce/plugins/media/editor_plugin_src.js')
-rw-r--r-- | 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 4478ebb59..8bb7d5b59 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 @@ var TinyMCE_MediaPlugin = { 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 @@ var TinyMCE_MediaPlugin = { 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>';
}
|