yonote/yjs
24
0
Fork 0
Code Pull Requests 1 Releases Activity

local sourceDir causes troubles if modules are required by a yjs instance

Browse Source
This commit is contained in:
Kevin Jahns 2016-10-12 15:51:42 +02:00
parent 8b24284e25
commit d1059b5d04
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/y.js
View File

@ -37,8 +37,8 @@ Y.extend = function (name, value) {
} }
Y.requestModules = requestModules Y.requestModules = requestModules
function requestModules (modules, sourceDir) { function requestModules (modules) {
sourceDir = sourceDir || '/bower_components' var sourceDir = Y.sourceDir || '/bower_components'
// determine if this module was compiled for es5 or es6 (y.js vs. y.es6) // 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.. // if Insert.execute is a Function, then it isnt a generator..
// then load the es5(.js) files.. // then load the es5(.js) files..
@ -103,6 +103,9 @@ type YOptions = {
*/ */
function Y (opts/* :YOptions */) /* :Promise<YConfig> */ { function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
if (opts.sourceDir != null) {
Y.sourceDir = opts.sourceDir
}
opts.types = opts.types != null ? opts.types : [] opts.types = opts.types != null ? opts.types : []
var modules = [opts.db.name, opts.connector.name].concat(opts.types) var modules = [opts.db.name, opts.connector.name].concat(opts.types)
for (var name in opts.share) { for (var name in opts.share) {
@ -110,7 +113,7 @@ function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
} }
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
setTimeout(function () { setTimeout(function () {
Y.requestModules(modules, opts.sourceDir).then(function () { Y.requestModules(modules).then(function () {
if (opts == null) reject('An options object is expected! ') 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 == 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)') else if (opts.connector.name == null) reject('You must specify connector name! (missing connector.name property)')