Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
428d825f41 |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "yjs",
|
"name": "yjs",
|
||||||
"version": "11.2.0",
|
"version": "11.2.1",
|
||||||
"homepage": "y-js.org",
|
"homepage": "y-js.org",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Kevin Jahns <kevin.jahns@rwth-aachen.de>"
|
"Kevin Jahns <kevin.jahns@rwth-aachen.de>"
|
||||||
|
|||||||
35
y.es6
35
y.es6
@@ -3228,6 +3228,7 @@ function requestModules (modules) {
|
|||||||
})
|
})
|
||||||
promises.push(requireModule.promise)
|
promises.push(requireModule.promise)
|
||||||
} else {
|
} else {
|
||||||
|
console.info('YJS: Please do not depend on automatic requiring of modules anymore! Extend modules as follows `require(\'y-modulename\')(Y)`')
|
||||||
require(modulename)(Y)
|
require(modulename)(Y)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -3274,23 +3275,25 @@ function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
|
|||||||
modules.push(opts.share[name])
|
modules.push(opts.share[name])
|
||||||
}
|
}
|
||||||
Y.sourceDir = opts.sourceDir
|
Y.sourceDir = opts.sourceDir
|
||||||
return Y.requestModules(modules).then(function () {
|
return new Promise(function (resolve, reject) {
|
||||||
return new Promise(function (resolve, reject) {
|
setTimeout(function () {
|
||||||
if (opts == null) reject('An options object is expected! ')
|
Y.requestModules(modules).then(function () {
|
||||||
else if (opts.connector == null) reject('You must specify a connector! (missing connector property)')
|
if (opts == null) reject('An options object is expected! ')
|
||||||
else if (opts.connector.name == null) reject('You must specify connector name! (missing connector.name property)')
|
else if (opts.connector == null) reject('You must specify a connector! (missing connector property)')
|
||||||
else if (opts.db == null) reject('You must specify a database! (missing db 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 db name! (missing db.name property)')
|
else if (opts.db == null) reject('You must specify a database! (missing db property)')
|
||||||
else if (opts.share == null) reject('You must specify a set of shared types!')
|
else if (opts.connector.name == null) reject('You must specify db name! (missing db.name property)')
|
||||||
else {
|
else if (opts.share == null) reject('You must specify a set of shared types!')
|
||||||
var yconfig = new YConfig(opts)
|
else {
|
||||||
yconfig.db.whenUserIdSet(function () {
|
var yconfig = new YConfig(opts)
|
||||||
yconfig.init(function () {
|
yconfig.db.whenUserIdSet(function () {
|
||||||
resolve(yconfig)
|
yconfig.init(function () {
|
||||||
|
resolve(yconfig)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
})
|
}
|
||||||
}
|
}).catch(reject)
|
||||||
})
|
}, 0)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user