suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete code for old Firefox versions

Browse Source
This commit is contained in:
Dan Stillman 2016-10-08 19:15:49 -04:00
parent 3bf82a4d4d
commit 6f6ce33377
10 changed files with 82 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chrome/content/zotero/bindings/itembox.xml
View File

@ -1071,9 +1071,6 @@
<body> <body>
<![CDATA[ <![CDATA[
var sbo = document.getAnonymousNodes(this)[0].boxObject; var sbo = document.getAnonymousNodes(this)[0].boxObject;
if (Zotero.platformMajorVersion < 36) {
sbo.QueryInterface(Components.interfaces.nsIScrollBoxObject);
}
sbo.ensureElementIsVisible(elem); sbo.ensureElementIsVisible(elem);
]]> ]]>
</body> </body>

3
chrome/content/zotero/bindings/tagsbox.xml
View File

@ -1019,9 +1019,6 @@
<body> <body>
<![CDATA[ <![CDATA[
var sbo = document.getAnonymousNodes(this)[0].boxObject; var sbo = document.getAnonymousNodes(this)[0].boxObject;
if (Zotero.platformMajorVersion < 36) {
sbo.QueryInterface(Components.interfaces.nsIScrollBoxObject);
}
sbo.ensureElementIsVisible(elem); sbo.ensureElementIsVisible(elem);
]]> ]]>
</body> </body>

15
chrome/content/zotero/browser.js
View File

@ -268,18 +268,9 @@ var Zotero_Browser = new function() {
function(e) { Zotero_Browser.resize(e) }, false); function(e) { Zotero_Browser.resize(e) }, false);
// Resize on text zoom changes // Resize on text zoom changes
// Fx2 var reduce = document.getElementById('cmd_fullZoomReduce');
var reduce = document.getElementById('cmd_textZoomReduce'); var enlarge = document.getElementById('cmd_fullZoomEnlarge');
if (reduce) { var reset = document.getElementById('cmd_fullZoomReset');
var enlarge = document.getElementById('cmd_textZoomEnlarge');
var reset = document.getElementById('cmd_textZoomReset');
}
// Fx3
else {
var reduce = document.getElementById('cmd_fullZoomReduce');
var enlarge = document.getElementById('cmd_fullZoomEnlarge');
var reset = document.getElementById('cmd_fullZoomReset');
}
if(reduce) reduce.addEventListener("command", if(reduce) reduce.addEventListener("command",
function(e) { Zotero_Browser.resize(e) }, false); function(e) { Zotero_Browser.resize(e) }, false);

73
chrome/content/zotero/charsetMenu.js
View File

@ -44,62 +44,29 @@ var Zotero_Charset_Menu = new function() {
var charsets = []; var charsets = [];
if(Zotero.platformMajorVersion >= 32) { Components.utils.import("resource://gre/modules/CharsetMenu.jsm");
Components.utils.import("resource://gre/modules/CharsetMenu.jsm"); var cmData = CharsetMenu.getData();
var cmData = CharsetMenu.getData(); for (let charsetList of [cmData.pinnedCharsets, cmData.otherCharsets]) {
for (let charsetList of [cmData.pinnedCharsets, cmData.otherCharsets]) { for each(var charsetInfo in charsetList) {
for each(var charsetInfo in charsetList) { if(charsetInfo.value == "UTF-8") {
if(charsetInfo.value == "UTF-8") { charsets.push({
charsets.push({ "label":"Unicode (UTF-8)",
"label":"Unicode (UTF-8)", "value":"UTF-8"
"value":"UTF-8" });
}); } else {
} else { charsets.push({
charsets.push({ "label":charsetInfo.label,
"label":charsetInfo.label, "value":charsetInfo.value
"value":charsetInfo.value });
});
}
} }
} }
charsets = charsets.concat([
{"label":"UTF-16LE", "value":"UTF-16LE"},
{"label":"UTF-16BE", "value":"UTF-16BE"},
{"label":"Western (IBM-850)", "value":"IBM850"},
{"label":"Western (MacRoman)", "value":"macintosh"}
]);
} else {
var charsetConverter = Components.classes["@mozilla.org/charset-converter-manager;1"].
getService(Components.interfaces.nsICharsetConverterManager);
var ccCharsets = charsetConverter.getEncoderList();
// add charsets to popup in order
while(ccCharsets.hasMore()) {
var charset = ccCharsets.getNext();
try {
var label = charsetConverter.getCharsetTitle(charset);
} catch(e) {
continue;
}
var isUTF16 = charset.length >= 6 && charset.substr(0, 6) == "UTF-16";
// Show UTF-16 element appropriately depending on exportMenu
if(isUTF16 && exportMenu == (charset == "UTF-16") ||
(!exportMenu && charset == "UTF-32LE")) {
continue;
} else if(charset == "x-mac-roman") {
// use the IANA name
charset = "macintosh";
} else if(!exportMenu && charset == "UTF-32BE") {
label = "Unicode (UTF-32)";
charset = "UTF-32";
}
charsets.push({
"label":label,
"value":charset
});
}
} }
charsets = charsets.concat([
{"label":"UTF-16LE", "value":"UTF-16LE"},
{"label":"UTF-16BE", "value":"UTF-16BE"},
{"label":"Western (IBM-850)", "value":"IBM850"},
{"label":"Western (MacRoman)", "value":"macintosh"}
]);
for(var i=0; i<charsets.length; i++) { for(var i=0; i<charsets.length; i++) {
var charset = charsets[i].value, var charset = charsets[i].value,

2
chrome/content/zotero/xpcom/openurl.js
View File

@ -245,7 +245,7 @@ Zotero.OpenURL = new function() {
} }
function _cloneIfNecessary(obj1, obj2) { function _cloneIfNecessary(obj1, obj2) {
if(Zotero.isFx && !Zotero.isBookmarklet && Zotero.platformMajorVersion >= 32) { if (Zotero.isFx && !Zotero.isBookmarklet) {
return Components.utils.cloneInto(obj1, obj2); return Components.utils.cloneInto(obj1, obj2);
} }
return obj1; return obj1;

2
chrome/content/zotero/xpcom/translation/translate.js
View File

@ -429,7 +429,7 @@ Zotero.Translate.Sandbox = {
}); });
}; };
if(Zotero.isFx && Zotero.platformMajorVersion >= 33) { if (Zotero.isFx) {
for(var i in safeTranslator) { for(var i in safeTranslator) {
if (typeof(safeTranslator[i]) === "function") { if (typeof(safeTranslator[i]) === "function") {
safeTranslator[i] = translate._sandboxManager._makeContentForwarder(function(func) { safeTranslator[i] = translate._sandboxManager._makeContentForwarder(function(func) {

122
chrome/content/zotero/xpcom/translation/translate_firefox.js
View File

@ -407,56 +407,52 @@ Zotero.Translate.SandboxManager = function(sandboxLocation) {
var expr = "(function(x) { return function() { this.args = arguments; return Function.prototype.apply.call(x, this); }.bind({}); })"; var expr = "(function(x) { return function() { this.args = arguments; return Function.prototype.apply.call(x, this); }.bind({}); })";
this._makeContentForwarder = Components.utils.evalInSandbox(expr, sandbox); this._makeContentForwarder = Components.utils.evalInSandbox(expr, sandbox);
if (Zotero.platformMajorVersion >= 35) { var _proxy = Components.utils.evalInSandbox('(function (target, x, overrides) {'+
var _proxy = Components.utils.evalInSandbox('(function (target, x, overrides) {'+ ' return new Proxy(x, ProxyHandler(target, overrides));'+
' return new Proxy(x, ProxyHandler(target, overrides));'+ '})', sandbox);
'})', sandbox); var wrap = this.wrap = function(target, x, overrides) {
var wrap = this.wrap = function(target, x, overrides) { if (target === null || (typeof target !== "object" && typeof target !== "function")) return target;
if (target === null || (typeof target !== "object" && typeof target !== "function")) return target; if (!x) x = new sandbox.Object();
if (!x) x = new sandbox.Object(); return _proxy(target, x, overrides);
return _proxy(target, x, overrides); };
var me = this;
sandbox.ProxyHandler = this._makeContentForwarder(function() {
var target = (this.args.wrappedJSObject || this.args)[0];
var overrides = (this.args.wrappedJSObject || this.args)[1] || {};
if(target instanceof Components.interfaces.nsISupports) {
target = new XPCNativeWrapper(target);
}
var ret = new sandbox.Object();
var wrappedRet = ret.wrappedJSObject || ret;
wrappedRet.has = function(x, prop) {
return overrides.hasOwnProperty(prop) || prop in target;
}; };
var me = this; wrappedRet.get = function(x, prop, receiver) {
sandbox.ProxyHandler = this._makeContentForwarder(function() { if (prop === "__wrappedObject") return target;
var target = (this.args.wrappedJSObject || this.args)[0]; if (prop === "__wrapperOverrides") return overrides;
var overrides = (this.args.wrappedJSObject || this.args)[1] || {}; if (prop === "__wrappingManager") return me;
if(target instanceof Components.interfaces.nsISupports) { var y = overrides.hasOwnProperty(prop) ? overrides[prop] : target[prop];
target = new XPCNativeWrapper(target); if (y === null || (typeof y !== "object" && typeof y !== "function")) return y;
} return wrap(y, typeof y === "function" ? function() {
var ret = new sandbox.Object(); var args = Array.prototype.slice.apply(arguments);
var wrappedRet = ret.wrappedJSObject || ret; for (var i = 0; i < args.length; i++) {
wrappedRet.has = function(x, prop) { if (typeof args[i] === "object" && args[i] !== null &&
return overrides.hasOwnProperty(prop) || prop in target; args[i].wrappedJSObject && args[i].wrappedJSObject.__wrappedObject)
}; args[i] = new XPCNativeWrapper(args[i].wrappedJSObject.__wrappedObject);
wrappedRet.get = function(x, prop, receiver) { }
if (prop === "__wrappedObject") return target; return wrap(y.apply(target, args));
if (prop === "__wrapperOverrides") return overrides; } : new sandbox.Object());
if (prop === "__wrappingManager") return me; };
var y = overrides.hasOwnProperty(prop) ? overrides[prop] : target[prop]; wrappedRet.ownKeys = function(x) {
if (y === null || (typeof y !== "object" && typeof y !== "function")) return y; return Components.utils.cloneInto(target.getOwnPropertyNames(), sandbox);
return wrap(y, typeof y === "function" ? function() { };
var args = Array.prototype.slice.apply(arguments); wrappedRet.enumerate = function(x) {
for (var i = 0; i < args.length; i++) { var y = new sandbox.Array();
if (typeof args[i] === "object" && args[i] !== null && for (var i in target) y.wrappedJSObject.push(i);
args[i].wrappedJSObject && args[i].wrappedJSObject.__wrappedObject) return y;
args[i] = new XPCNativeWrapper(args[i].wrappedJSObject.__wrappedObject); };
} return ret;
return wrap(y.apply(target, args)); });
} : new sandbox.Object());
};
wrappedRet.ownKeys = function(x) {
return Components.utils.cloneInto(target.getOwnPropertyNames(), sandbox);
};
wrappedRet.enumerate = function(x) {
var y = new sandbox.Array();
for (var i in target) y.wrappedJSObject.push(i);
return y;
};
return ret;
});
} else {
this.wrap = Zotero.Translate.DOMWrapper.wrap;
}
} }
Zotero.Translate.SandboxManager.prototype = { Zotero.Translate.SandboxManager.prototype = {
@ -490,25 +486,17 @@ Zotero.Translate.SandboxManager.prototype = {
var isObject = typeof object[localKey] === "object"; var isObject = typeof object[localKey] === "object";
if(isFunction || isObject) { if(isFunction || isObject) {
if(isFunction) { if(isFunction) {
if (Zotero.platformMajorVersion >= 33) { attachTo[localKey] = this._makeContentForwarder(function() {
attachTo[localKey] = this._makeContentForwarder(function() { var args = Array.prototype.slice.apply(this.args.wrappedJSObject || this.args);
var args = Array.prototype.slice.apply(this.args.wrappedJSObject || this.args); for(var i = 0; i<args.length; i++) {
for(var i = 0; i<args.length; i++) { // Make sure we keep XPCNativeWrappers
// Make sure we keep XPCNativeWrappers if(args[i] instanceof Components.interfaces.nsISupports) {
if(args[i] instanceof Components.interfaces.nsISupports) { args[i] = new XPCNativeWrapper(args[i]);
args[i] = new XPCNativeWrapper(args[i]);
}
} }
if(passAsFirstArgument) args.unshift(passAsFirstArgument); }
return me.copyObject(object[localKey].apply(object, args)); if(passAsFirstArgument) args.unshift(passAsFirstArgument);
}); return me.copyObject(object[localKey].apply(object, args));
} else { });
attachTo[localKey] = function() {
var args = Array.prototype.slice.apply(arguments);
if(passAsFirstArgument) args.unshift(passAsFirstArgument);
return me.copyObject(object[localKey].apply(object, args));
};
}
} else { } else {
attachTo[localKey] = new sandbox.Object(); attachTo[localKey] = new sandbox.Object();
} }

2
chrome/content/zotero/xpcom/utilities.js
View File

@ -1871,7 +1871,7 @@ Zotero.Utilities = {
item.setCreator(item.getCreators().length, creator); item.setCreator(item.getCreators().length, creator);
} else { } else {
creator.creatorType = Zotero.CreatorTypes.getName(creatorTypeID); creator.creatorType = Zotero.CreatorTypes.getName(creatorTypeID);
if(Zotero.isFx && !Zotero.isBookmarklet && Zotero.platformMajorVersion >= 32) { if (Zotero.isFx && !Zotero.isBookmarklet) {
creator = Components.utils.cloneInto(creator, item); creator = Components.utils.cloneInto(creator, item);
} }
item.creators.push(creator); item.creators.push(creator);

9
chrome/content/zotero/xpcom/zotero.js
View File

@ -1618,15 +1618,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
.getService(Components.interfaces.nsILocaleService); .getService(Components.interfaces.nsILocaleService);
var appLocale = localeService.getApplicationLocale(); var appLocale = localeService.getApplicationLocale();
// Use nsICollation before Fx30
if (Zotero.platformMajorVersion < 30) {
var localeService = Components.classes["@mozilla.org/intl/nslocaleservice;1"]
.getService(Components.interfaces.nsILocaleService);
var collationFactory = Components.classes["@mozilla.org/intl/collation-factory;1"]
.getService(Components.interfaces.nsICollationFactory);
return this.collation = collationFactory.CreateCollation(appLocale);
}
try { try {
var locale = appLocale.getCategory('NSILOCALE_COLLATE'); var locale = appLocale.getCategory('NSILOCALE_COLLATE');
// Extract a valid language tag // Extract a valid language tag

10
components/zotero-service.js
View File

@ -505,12 +505,4 @@ ZoteroCommandLineHandler.prototype.__defineGetter__("Zotero", function() {
return zContext.Zotero; return zContext.Zotero;
}); });
/** var NSGetFactory = XPCOMUtils.generateNSGetFactory([ZoteroService, ZoteroCommandLineHandler]);
* XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4).
* XPCOMUtils.generateNSGetModule is for Mozilla 1.9.2 (Firefox 3.6).
*/
if (XPCOMUtils.generateNSGetFactory) {
var NSGetFactory = XPCOMUtils.generateNSGetFactory([ZoteroService, ZoteroCommandLineHandler]);
} else {
var NSGetModule = XPCOMUtils.generateNSGetModule([ZoteroService, ZoteroCommandLineHandler]);
}