Move require() into ZoteroContext and fix Bluebird module path
This commit is contained in:
parent
319edae7f2
commit
6afc58a629
3 changed files with 16 additions and 17 deletions
2
.babelrc
2
.babelrc
|
@ -25,7 +25,7 @@
|
||||||
[
|
[
|
||||||
"transform-async-to-module-method",
|
"transform-async-to-module-method",
|
||||||
{
|
{
|
||||||
"module": "bluebird/bluebird.js",
|
"module": "resource://zotero/bluebird/bluebird.js",
|
||||||
"method": "coroutine"
|
"method": "coroutine"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
@ -32,22 +32,6 @@ Components.utils.import("resource://gre/modules/PluralForm.jsm");
|
||||||
|
|
||||||
Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
|
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
|
* Core functions
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -155,6 +155,21 @@ var zInitOptions = {};
|
||||||
|
|
||||||
ZoteroContext = function() {}
|
ZoteroContext = function() {}
|
||||||
ZoteroContext.prototype = {
|
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()
|
* Convenience method to replicate window.alert()
|
||||||
**/
|
**/
|
||||||
|
|
Loading…
Add table
Reference in a new issue