lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixing some issues IE (in compat mode of 8) had with the addmedia plugin

Browse Source 
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
This commit is contained in:
Nathan Heskew
2010-03-05 14:07:26 -08:00
parent e64f0a3312
commit 70f4b727c1
4 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx
View File

@@ -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 %><%
} %>
})

2
src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/editor_plugin.js
View File

@@ -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)})();
(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) })();

2
src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/editor_plugin_src.js
View File

@@ -20,7 +20,7 @@
height: 110 + parseInt(ed.getLang('addmedia.delta_height', 0)),
inline: 1
}, {
plugin_url: url, // Plugin absolute URL
plugin_url: url
});
});

71
src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/js/addmedia.js
View File

@@ -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) {