Skip to content
Snippets Groups Projects
Commit bc856a09 authored by Kevin Jahns's avatar Kevin Jahns
Browse files

Release 11.2.1

parent f7ae62a9
No related branches found
No related tags found
No related merge requests found
Subproject commit b9f9c762ebed9b30c44b1c87b555e89a7257ae58 Subproject commit 428d825f4141fd3198bb88aee88a014278c4c856
{ {
"name": "yjs", "name": "yjs",
"version": "11.2.0", "version": "11.2.1",
"description": "A framework for real-time p2p shared editing on arbitrary complex data types", "description": "A framework for real-time p2p shared editing on arbitrary complex data types",
"main": "./src/y.js", "main": "./src/y.js",
"scripts": { "scripts": {
......
...@@ -50,6 +50,7 @@ function requestModules (modules) { ...@@ -50,6 +50,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 {
...@@ -96,23 +97,25 @@ function Y (opts/* :YOptions */) /* :Promise<YConfig> */ { ...@@ -96,23 +97,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)
}) })
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment