From 58fb6502e3550e59afa8799d36dfce61a18f8b1b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 15 Dec 2009 03:48:45 -0500
Subject: [PATCH] - Updated TinyMCE to 3.2.7
---
program/js/tiny_mce/plugins/media/editor_plugin_src.js | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 faa0cf7..2692e0a 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 1037 2009-03-02 16:41:15Z spocke $
+ * $Id: editor_plugin_src.js 1222 2009-09-03 17:26:47Z spocke $
*
* @author Moxiecode
* @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
@@ -61,7 +61,7 @@
if (ed.settings.content_css !== false)
ed.dom.loadCSS(url + "/css/content.css");
- if (ed.theme.onResolveName) {
+ if (ed.theme && ed.theme.onResolveName) {
ed.theme.onResolveName.add(function(th, o) {
if (o.name == 'img') {
each(lo, function(v, k) {
@@ -341,7 +341,7 @@
_createImg : function(cl, n) {
var im, dom = this.editor.dom, pa = {}, ti = '', args;
- args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality'];
+ args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality', 'data'];
// Create image
im = dom.create('img', {
@@ -372,6 +372,12 @@
delete pa.movie;
}
+ // No src try data
+ if (!pa.src) {
+ pa.src = pa.data;
+ delete pa.data;
+ }
+
// Merge with embed args
n = dom.select('.mceItemEmbed', n)[0];
if (n) {
--
Gitblit v1.9.1