Refs #3853. Upgraded TinyMCE to 3.4.6. Embed still inserts the content in the wrong place for IE 8.

1 files changed, 12 insertions, 8 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
index 72c9cbf63..546b69c0d 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
@@ -9,13 +9,13 @@ var ImageDialog = {
 	},

 

 	init : function(ed) {

-		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode();

+		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode(), fl = tinyMCEPopup.getParam('external_image_list', 'tinyMCEImageList');

 

 		tinyMCEPopup.resizeToInnerSize();

 		this.fillClassList('class_list');

-		this.fillFileList('src_list', 'tinyMCEImageList');

-		this.fillFileList('over_list', 'tinyMCEImageList');

-		this.fillFileList('out_list', 'tinyMCEImageList');

+		this.fillFileList('src_list', fl);

+		this.fillFileList('over_list', fl);

+		this.fillFileList('out_list', fl);

 		TinyMCE_EditableSelects.init();

 

 		if (n.nodeName == 'IMG') {

@@ -171,9 +171,13 @@ var ImageDialog = {
 		if (el && el.nodeName == 'IMG') {

 			ed.dom.setAttribs(el, args);

 		} else {

-			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});

-			ed.dom.setAttribs('__mce_tmp', args);

-			ed.dom.setAttrib('__mce_tmp', 'id', '');

+			tinymce.each(args, function(value, name) {

+				if (value === "") {

+					delete args[name];

+				}

+			});

+

+			ed.execCommand('mceInsertContent', false, tinyMCEPopup.editor.dom.createHTML('img', args), {skip_undo : 1});

 			ed.undoManager.add();

 		}

 

@@ -287,7 +291,7 @@ var ImageDialog = {
 	fillFileList : function(id, l) {

 		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;

 

-		l = window[l];

+		l = typeof(l) === 'function' ? l() : window[l];

 		lst.options.length = 0;

 

 		if (l && l.length > 0) {