From d1059b5d04d344313e9503fa18b7630953a1f1f2 Mon Sep 17 00:00:00 2001 From: Kevin Jahns Date: Wed, 12 Oct 2016 15:51:42 +0200 Subject: [PATCH] local sourceDir causes troubles if modules are required by a yjs instance --- src/y.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/y.js b/src/y.js index 37de69e5..38ff342d 100644 --- a/src/y.js +++ b/src/y.js @@ -37,8 +37,8 @@ Y.extend = function (name, value) { } Y.requestModules = requestModules -function requestModules (modules, sourceDir) { - sourceDir = sourceDir || '/bower_components' +function requestModules (modules) { + var sourceDir = Y.sourceDir || '/bower_components' // determine if this module was compiled for es5 or es6 (y.js vs. y.es6) // if Insert.execute is a Function, then it isnt a generator.. // then load the es5(.js) files.. @@ -103,6 +103,9 @@ type YOptions = { */ function Y (opts/* :YOptions */) /* :Promise */ { + if (opts.sourceDir != null) { + Y.sourceDir = opts.sourceDir + } opts.types = opts.types != null ? opts.types : [] var modules = [opts.db.name, opts.connector.name].concat(opts.types) for (var name in opts.share) { @@ -110,7 +113,7 @@ function Y (opts/* :YOptions */) /* :Promise */ { } return new Promise(function (resolve, reject) { setTimeout(function () { - Y.requestModules(modules, opts.sourceDir).then(function () { + Y.requestModules(modules).then(function () { if (opts == null) reject('An options object is expected! ') else if (opts.connector == null) reject('You must specify a connector! (missing connector property)') else if (opts.connector.name == null) reject('You must specify connector name! (missing connector.name property)')