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

More XPI fixes for TinyMCE

Browse source
This commit is contained in:
Dan Stillman 2010-10-09 19:22:28 +00:00
parent f17e0d6d28
commit 490794dfb9
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -537,21 +537,26 @@ tinymce.create('tinymce.util.Dispatcher', {
return; return;
} }
// Added by Dan S./Zotero
u = u.replace("jar:file", "jarfile");
u = u.replace("zotero@chnm.gmu.edu", "zotero.chnm.gmu.edu");
// Absolute path with no host, fake host and protocol // Absolute path with no host, fake host and protocol
if (u.indexOf('/') === 0 && u.indexOf('//') !== 0) if (u.indexOf('/') === 0 && u.indexOf('//') !== 0)
u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u; u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u;
// Relative path http:// or protocol relative //path // Relative path http:// or protocol relative //path
if (!/^\w*:?\/\//.test(u)) if (!/^\w*:?\/\//.test(u))
u = (s.base_uri.protocol || 'http') + '://mce_host' + t.toAbsPath(s.base_uri.path, u); // Modified by Dan S./Zotero
//u = (s.base_uri.protocol || 'http') + '://mce_host' + t.toAbsPath(s.base_uri.path, u);
u = s.base_uri.protocol + '://' + s.base_uri.path + '/' + u;
// Added by Dan S./Zotero
u = u.replace("jar:file", "jarfile");
u = u.replace("zotero@chnm.gmu.edu", "zotero.chnm.gmu.edu");
// 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];