\r
e = ed.selection.getNode();\r
\r
- this.fillFileList('image_list', 'tinyMCEImageList');\r
+ this.fillFileList('image_list', tinyMCEPopup.getParam('external_image_list', 'tinyMCEImageList'));\r
\r
if (e.nodeName == 'IMG') {\r
f.src.value = ed.dom.getAttrib(e, 'src');\r
fillFileList : function(id, l) {\r
var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;\r
\r
- l = window[l];\r
+ l = typeof(l) === 'function' ? l() : window[l];\r
\r
if (l && l.length > 0) {\r
lst.options[lst.options.length] = new Option('', '');\r
args.style = this.styleVal;\r
\r
tinymce.extend(args, {\r
- src : f.src.value,\r
+ src : f.src.value.replace(/ /g, '%20'),\r
alt : f.alt.value,\r
width : f.width.value,\r
height : f.height.value\r
\r
if (el && el.nodeName == 'IMG') {\r
ed.dom.setAttribs(el, args);\r
+ tinyMCEPopup.editor.execCommand('mceRepaint');\r
+ tinyMCEPopup.editor.focus();\r
} else {\r
- ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});\r
- ed.dom.setAttribs('__mce_tmp', args);\r
- ed.dom.setAttrib('__mce_tmp', 'id', '');\r
+ tinymce.each(args, function(value, name) {\r
+ if (value === "") {\r
+ delete args[name];\r
+ }\r
+ });\r
+\r
+ ed.execCommand('mceInsertContent', false, tinyMCEPopup.editor.dom.createHTML('img', args), {skip_undo : 1});\r
ed.undoManager.add();\r
}\r
\r