Imported Upstream version 0.5

[roundcube.git] / program / js / tiny_mce / plugins / media / editor_plugin_src.js

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 faa0cf73032ffb58f4f166316a26923e82e7f2ee..fc84e5b6c5bfcd31ab44a21f3e541b4836b000a5 100644 (file)
--- a/program/js/tiny_mce/plugins/media/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/media/editor_plugin_src.js
@@ -1,8 +1,11 @@
 /**\r
- * $Id: editor_plugin_src.js 1037 2009-03-02 16:41:15Z spocke $\r
+ * editor_plugin_src.js\r
  *\r
- * @author Moxiecode\r
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.\r
+ * Copyright 2009, Moxiecode Systems AB\r
+ * Released under LGPL License.\r
+ *\r
+ * License: http://tinymce.moxiecode.com/license\r
+ * Contributing: http://tinymce.moxiecode.com/contributing\r
  */\r
 \r
 (function() {\r
@@ -61,7 +64,7 @@
                                if (ed.settings.content_css !== false)\r
                                        ed.dom.loadCSS(url + "/css/content.css");\r
 \r
-                               if (ed.theme.onResolveName) {\r
+                               if (ed.theme && ed.theme.onResolveName) {\r
                                        ed.theme.onResolveName.add(function(th, o) {\r
                                                if (o.name == 'img') {\r
                                                        each(lo, function(v, k) {\r
@@ -234,7 +237,7 @@
                        if (stc) {\r
                                ob = dom.create('span', {\r
                                        id : p.id,\r
-                                       mce_name : 'object',\r
+                                       _mce_name : 'object',\r
                                        type : 'application/x-shockwave-flash',\r
                                        data : p.src,\r
                                        style : dom.getAttrib(n, 'style'),\r
@@ -244,7 +247,7 @@
                        } else {\r
                                ob = dom.create('span', {\r
                                        id : p.id,\r
-                                       mce_name : 'object',\r
+                                       _mce_name : 'object',\r
                                        classid : "clsid:" + o.classid,\r
                                        style : dom.getAttrib(n, 'style'),\r
                                        codebase : o.codebase,\r
@@ -260,12 +263,12 @@
                                                k = 'url';\r
 \r
                                        if (v)\r
-                                               dom.add(ob, 'span', {mce_name : 'param', name : k, '_mce_value' : v});\r
+                                               dom.add(ob, 'span', {_mce_name : 'param', name : k, '_mce_value' : v});\r
                                }\r
                        });\r
 \r
                        if (!stc)\r
-                               dom.add(ob, 'span', tinymce.extend({mce_name : 'embed', type : o.type, style : dom.getAttrib(n, 'style')}, p));\r
+                               dom.add(ob, 'span', tinymce.extend({_mce_name : 'embed', type : o.type, style : dom.getAttrib(n, 'style')}, p));\r
 \r
                        return ob;\r
                },\r
@@ -341,7 +344,7 @@
                _createImg : function(cl, n) {\r
                        var im, dom = this.editor.dom, pa = {}, ti = '', args;\r
 \r
-                       args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality'];        \r
+                       args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality', 'data'];        \r
 \r
                        // Create image\r
                        im = dom.create('img', {\r
@@ -372,6 +375,12 @@
                                delete pa.movie;\r
                        }\r
 \r
+                       // No src try data\r
+                       if (!pa.src) {\r
+                               pa.src = pa.data;\r
+                               delete pa.data;\r
+                       }\r
+\r
                        // Merge with embed args\r
                        n = dom.select('.mceItemEmbed', n)[0];\r
                        if (n) {\r