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

Fix some XPCOM Zotero breakage from previous commits

Browse source
This commit is contained in:
Adomas Venčkauskas 2018-08-06 12:24:17 +03:00
parent aa908516eb
commit 51e181cb81
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
chrome/content/zotero/xpcom/zotero.js
View file

@ -46,7 +46,6 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
this.setFontSize = setFontSize; this.setFontSize = setFontSize;
this.flattenArguments = flattenArguments; this.flattenArguments = flattenArguments;
this.getAncestorByTagName = getAncestorByTagName; this.getAncestorByTagName = getAncestorByTagName;
this.randomString = randomString;
this.reinit = reinit; // defined in zotero-service.js this.reinit = reinit; // defined in zotero-service.js
// Public properties // Public properties
@ -1338,7 +1337,7 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
} }
function setFontSize(rootElement) { function setFontSize(rootElement) {
return Zotero.Utilities.setFontSize(rootElement); return Zotero.Utilities.Internal.setFontSize(rootElement);
} }
function flattenArguments(args){ function flattenArguments(args){
@ -1349,8 +1348,8 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
return Zotero.Utilities.Internal.getAncestorByTagName(elem, tagName); return Zotero.Utilities.Internal.getAncestorByTagName(elem, tagName);
} }
function randomString(len, chars) { this.randomString = function(len, chars) {
return Zotero.Utilities.Internal.randomString(len, chars); return Zotero.Utilities.randomString(len, chars);
} }

4
components/zotero-service.js
View file

@ -39,6 +39,8 @@ const xpcomFilesAll = [
'date', 'date',
'debug', 'debug',
'error', 'error',
'utilities',
'utilities_internal',
'file', 'file',
'http', 'http',
'mimeTypeHandler', 'mimeTypeHandler',
@ -51,9 +53,7 @@ const xpcomFilesAll = [
'translation/translate_firefox', 'translation/translate_firefox',
'translation/translator', 'translation/translator',
'translation/tlds', 'translation/tlds',
'utilities',
'isbn', 'isbn',
'utilities_internal',
'utilities_translate' 'utilities_translate'
]; ];