mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix TinyMCE in XPI builds

Browse source
This commit is contained in:
Dan Stillman 2008-10-16 22:29:26 +00:00
parent 4de529c03f
commit 994de2e65c
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
chrome/content/zotero/tinymce/tiny_mce.js vendored
View file

@ -517,13 +517,23 @@ tinymce.create('tinymce.util.Dispatcher', {
// Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri) // Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri)
u = u.replace(/@@/g, '(mce_at)'); // Zope 3 workaround, they use @@something u = u.replace(/@@/g, '(mce_at)'); // Zope 3 workaround, they use @@something
// Added by Dan S./Zotero
u = u.replace("jar:file", "jarfile");
u = u.replace("zotero@chnm.gmu.edu", "zotero.chnm.gmu.edu");
u = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u); u = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u);
each(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], function(v, i) { each(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], function(v, i) {
var s = u[i]; var s = u[i];
// Zope 3 workaround, they use @@something if (s) {
if (s) // Zope 3 workaround, they use @@something
s = s.replace(/\(mce_at\)/g, '@@'); s = s.replace(/\(mce_at\)/g, '@@');
// Added by Dan S./Zotero
s = s.replace("jarfile", "jar:file");
s = s.replace("zotero.chnm.gmu.edu", "zotero@chnm.gmu.edu");
}
t[v] = s; t[v] = s;
}); });
@ -887,7 +897,8 @@ tinymce.create('static tinymce.util.XHR', {
function ready() { function ready() {
if (!o.async || x.readyState == 4 || c++ > 10000) { if (!o.async || x.readyState == 4 || c++ > 10000) {
if (o.success && c < 10000 && x.status == 200) // Modified by Dan S./Zotero
if (o.success && c < 10000 && (x.status == 200 || x.status == 0))
o.success.call(o.success_scope, '' + x.responseText, x, o); o.success.call(o.success_scope, '' + x.responseText, x, o);
else if (o.error) else if (o.error)
o.error.call(o.error_scope, c > 10000 ? 'TIMED_OUT' : 'GENERAL', x, o); o.error.call(o.error_scope, c > 10000 ? 'TIMED_OUT' : 'GENERAL', x, o);