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

Move require() into ZoteroContext and fix Bluebird module path

Browse source
This commit is contained in:
Dan Stillman 2017-05-24 00:58:41 -04:00
parent 319edae7f2
commit 6afc58a629
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.babelrc
View file

@ -25,7 +25,7 @@
[
"transform-async-to-module-method",
{
"module": "bluebird/bluebird.js",
"module": "resource://zotero/bluebird/bluebird.js",
"method": "coroutine"
}
],

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

@ -32,22 +32,6 @@ Components.utils.import("resource://gre/modules/PluralForm.jsm");
Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
var require = (target) => {
var { Loader, Require, Module } = Components.utils.import('resource://gre/modules/commonjs/toolkit/loader.js');
var requirer = Module('/', '/');
var globals = {};
Components.utils.import("resource://gre/modules/Timer.jsm", globals);
var loader = Loader({
id: 'zotero/requireminimal',
globals
});
return (Require(loader, requirer))(target);
};
/*
* Core functions
*/

15
components/zotero-service.js
View file

@ -155,6 +155,21 @@ var zInitOptions = {};
ZoteroContext = function() {}
ZoteroContext.prototype = {
require: (target) => {
var { Loader, Require, Module } = Components.utils.import('resource://gre/modules/commonjs/toolkit/loader.js');
var requirer = Module('/', '/');
var globals = {};
Components.utils.import("resource://gre/modules/Timer.jsm", globals);
var loader = Loader({
id: 'zotero/requireminimal',
globals
});
return (Require(loader, requirer))(target);
},
/**
* Convenience method to replicate window.alert()
**/