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

Release 11.2.1

Browse Source
This commit is contained in:
Kevin Jahns 2016-05-24 15:25:14 +02:00
parent f7ae62a906
commit bc856a09f5
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist

@ -1 +1 @@
Subproject commit b9f9c762ebed9b30c44b1c87b555e89a7257ae58 Subproject commit 428d825f4141fd3198bb88aee88a014278c4c856

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"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": {

7
src/y.js
View File

@ -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,8 +97,9 @@ 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 () {
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)')
@ -112,7 +114,8 @@ function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
}) })
}) })
} }
}) }).catch(reject)
}, 0)
}) })
} }