From 70f4b727c164454250dfd72d749a46298e6a64d9 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Fri, 5 Mar 2010 14:07:26 -0800
Subject: [PATCH] Fixing some issues IE (in compat mode of 8) had with the
 addmedia plugin

Expanding browser verification of the plugin by 50% (if compat mode of a browser counts as an additional browser)

/me, sad for what was necessary

--HG--
branch : dev
---
 .../Parts/Common.Routable.ascx                |  4 +-
 .../Scripts/plugins/addmedia/editor_plugin.js |  2 +-
 .../plugins/addmedia/editor_plugin_src.js     |  2 +-
 .../Scripts/plugins/addmedia/js/addmedia.js   | 71 +++++++++++--------
 4 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx
index 5b835f8ed..0df7dba8d 100644
--- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx
+++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx
@@ -23,9 +23,9 @@
                 target:$("<%=String.Format("input#{0}Slug", !string.IsNullOrEmpty(Model.Prefix) ? Model.Prefix + "_" : "") %>"),
                 url:"<%=Url.Slugify() %>",
                 contentType:"<%=Model.RoutableAspect.ContentItem.ContentType %>",
-                id:"<%=Model.RoutableAspect.ContentItem.Id %>",<%
+                id:"<%=Model.RoutableAspect.ContentItem.Id %>"<%
                 var container = Model.RoutableAspect.ContentItem.As<ICommonAspect>().Container;
-                if (container != null) { %>
+                if (container != null) { %>,
                 containerId:<%=container.ContentItem.Id %><%
                 } %>
             })
diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/editor_plugin.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/editor_plugin.js
index 36542b596..1359e75d5 100644
--- a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/editor_plugin.js
+++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.PluginManager.requireLangPack("addmedia");tinymce.create('tinymce.plugins.Orchard.AddMedia',{init:function(ed,url){ed.addCommand('mceAddMedia',function(){ed.windowManager.open({file:url+'/addmedia.htm',width:550+parseInt(ed.getLang('addmedia.delta_width',0)),height:110+parseInt(ed.getLang('addmedia.delta_height',0)),inline:1},{plugin_url:url,})});ed.addButton('addmedia',{title:ed.getLang('addmedia.title'),cmd:'mceAddMedia',image:url+'/img/picture_add.png'})},createControl:function(n,cm){return null},getInfo:function(){return{longname:'Orchard AddMedia Plugin',author:'Nathan Heskew',authorurl:'http://orchardproject.net',infourl:'http://orchardproject.net',version:'0.1'}}});tinymce.PluginManager.add('addmedia',tinymce.plugins.Orchard.AddMedia)})();
\ No newline at end of file
+(function() { tinymce.PluginManager.requireLangPack("addmedia"); tinymce.create('tinymce.plugins.Orchard.AddMedia', { init: function(ed, url) { ed.addCommand('mceAddMedia', function() { ed.windowManager.open({ file: url + '/addmedia.htm', width: 550 + parseInt(ed.getLang('addmedia.delta_width', 0)), height: 110 + parseInt(ed.getLang('addmedia.delta_height', 0)), inline: 1 }, { plugin_url: url }) }); ed.addButton('addmedia', { title: ed.getLang('addmedia.title'), cmd: 'mceAddMedia', image: url + '/img/picture_add.png' }) }, createControl: function(n, cm) { return null }, getInfo: function() { return { longname: 'Orchard AddMedia Plugin', author: 'Nathan Heskew', authorurl: 'http://orchardproject.net', infourl: 'http://orchardproject.net', version: '0.1'} } }); tinymce.PluginManager.add('addmedia', tinymce.plugins.Orchard.AddMedia) })();
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/editor_plugin_src.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/editor_plugin_src.js
index dcba56eaf..ddba1b6f6 100644
--- a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/editor_plugin_src.js
+++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/editor_plugin_src.js
@@ -20,7 +20,7 @@
                     height: 110 + parseInt(ed.getLang('addmedia.delta_height', 0)),
                     inline: 1
                 }, {
-                    plugin_url: url, // Plugin absolute URL
+                    plugin_url: url
                 });
             });
 
diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/js/addmedia.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/js/addmedia.js
index 4bb12bd0c..eedb76709 100644
--- a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/js/addmedia.js
+++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/js/addmedia.js
@@ -10,43 +10,54 @@ var AddMediaDialog = {
     },
 
     addMedia: function(form) {
-        var iframeName = "addmedia__" + (new Date()).getTime()
-        var iframe = document.createElement("iframe");
-        iframe.name = iframeName;
+        var iframeName = "addmedia__" + (new Date()).getTime();
+
+        var iframe;
+        try {
+            iframe = document.createElement("<iframe name=\"" + iframeName + "\" />"); // <- for some vowel browser
+        } catch (ex) {
+            iframe = document.createElement("iframe");
+            iframe.name = iframeName;
+        }
         iframe.src = "about:blank";
-
         tinymce.DOM.setStyles(iframe, { display: "none" });
-        var iframeLoadHandler = tinymce.dom.Event.add(iframe, 'load', function(ev) {
-            var result = window.frames[iframeName].result, close = 0;
-            if (result && result.url) {
-                window.parent.AddMediaDialog.insertMedia(result.url);
-                close = 1;
-            } else if (result && result.error) {
-                alert(tinyMCEPopup.getLang("addmedia_dlg.msg_error") + "\n\r\n\r" + result.error);
-            } else {
-                var somethingPotentiallyHorrible = "";
-                try {
-                    somethingPotentiallyHorrible = window.frames[iframeName].document.getElementsByTagName("body")[0].innerHTML;
-                } catch (ex) { // some browsers flip out trying to access anything in the iframe when there's an error. best we can do is guess at this point
-                    somethingPotentiallyHorrible = tinyMCEPopup.getLang("addmedia_dlg.msg_error_unknown");
-                }
-                if (somethingPotentiallyHorrible) {
-                    alert(tinyMCEPopup.getLang("addmedia_dlg.msg_error_unexpected") + "\n\r\n\r" + somethingPotentiallyHorrible);
-                }
-            }
 
-            //cleanup
-            setTimeout(function() {
-                tinymce.dom.Event.remove(iframe, 'load', iframeLoadHandler);
-                tinymce.DOM.remove(iframe);
-                iframe = null;
-                if (close) window.parent.tinyMCEPopup.close();
-            },
+        var iframeLoadHandler = tinymce.dom.Event.add(iframe, 'load', function(ev) {
+            try {
+                var result = window.frames[iframeName].result, close = 0;
+
+                if (result && result.url) {
+                    window.parent.AddMediaDialog.insertMedia(result.url);
+                    close = 1;
+                } else if (result && result.error) {
+                    alert(tinyMCEPopup.getLang("addmedia_dlg.msg_error") + "\n\r\n\r" + result.error);
+                } else {
+                    var somethingPotentiallyHorrible = "";
+                    try {
+                        somethingPotentiallyHorrible = window.frames[iframeName].document.getElementsByTagName("body")[0].innerHTML;
+                    } catch (ex) { // some browsers flip out trying to access anything in the iframe when there's an error. best we can do is guess at this point
+                        somethingPotentiallyHorrible = tinyMCEPopup.getLang("addmedia_dlg.msg_error_unknown");
+                    }
+                    if (somethingPotentiallyHorrible) {
+                        alert(tinyMCEPopup.getLang("addmedia_dlg.msg_error_unexpected") + "\n\r\n\r" + somethingPotentiallyHorrible);
+                    }
+                }
+
+                //cleanup
+                setTimeout(function() {
+                    tinymce.dom.Event.remove(iframe, 'load', iframeLoadHandler);
+                    tinymce.DOM.remove(iframe);
+                    iframe = null;
+                    if (close) window.parent.tinyMCEPopup.close();
+                },
                 123);
+            } catch (ex) {
+                alert(ex.message);
+            }
         });
 
-        form.target = iframeName;
         tinymce.DOM.add(document.body, iframe);
+        form.target = iframe.name;
     },
 
     insertMedia: function(url) {