Compare commits

...

2 Commits

Author SHA1 Message Date
Kevin Jahns
428d825f41 Deploy 11.2.1 2016-05-24 15:24:53 +02:00
Kevin Jahns
b9f9c762eb Deploy 11.2.0 2016-05-10 18:12:57 +02:00
5 changed files with 89 additions and 72 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "yjs", "name": "yjs",
"version": "11.1.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
View File

@@ -963,18 +963,34 @@ module.exports = function (Y /* :any */) {
} }
} }
} }
// called by a transaction when an operation is added /*
* Called by a transaction when an operation is added.
* This function is especially important for y-indexeddb, where several instances may share a single database.
* Every time an operation is created by one instance, it is send to all other instances and operationAdded is called
*
* If it's not a Delete operation:
* * Checks if another operation is executable (listenersById)
* * Update state, if possible
*
* Always:
* * Call type
*/
* operationAdded (transaction, op) { * operationAdded (transaction, op) {
if (op.struct === 'Delete') {
var target = yield* transaction.getInsertion(op.target)
var type = this.initializedTypes[JSON.stringify(target.parent)]
if (type != null) {
yield* type._changed(transaction, op)
}
} else {
// increase SS // increase SS
yield* transaction.updateState(op.id[0]) yield* transaction.updateState(op.id[0])
var opLen = op.content != null ? op.content.length : 1 var opLen = op.content != null ? op.content.length : 1
for (let i = 0; i < opLen; i++) { for (let i = 0; i < opLen; i++) {
// notify whenOperation listeners (by id) // notify whenOperation listeners (by id)
var sid = JSON.stringify([op.id[0], op.id[1] + i]) var sid = JSON.stringify([op.id[0], op.id[1] + i])
var l = this.listenersById[sid] var l = this.listenersById[sid]
delete this.listenersById[sid] delete this.listenersById[sid]
if (l != null) { if (l != null) {
for (var key in l) { for (var key in l) {
var listener = l[key] var listener = l[key]
@@ -1017,6 +1033,7 @@ module.exports = function (Y /* :any */) {
} }
} }
} }
}
whenTransactionsFinished () { whenTransactionsFinished () {
if (this.transactionInProgress) { if (this.transactionInProgress) {
if (this.transactionsFinished == null) { if (this.transactionsFinished == null) {
@@ -1741,15 +1758,12 @@ module.exports = function (Y/* :any */) {
right = null right = null
} }
if (callType && !preventCallType) { if (callType && !preventCallType) {
var type = this.store.initializedTypes[JSON.stringify(target.parent)] yield* this.store.operationAdded(this, {
if (type != null) {
yield* type._changed(this, {
struct: 'Delete', struct: 'Delete',
target: target.id, target: target.id,
length: targetLength length: targetLength
}) })
} }
}
// need to gc in the end! // need to gc in the end!
yield* this.store.addToGarbageCollector.call(this, target, left) yield* this.store.addToGarbageCollector.call(this, target, left)
if (right != null) { if (right != null) {
@@ -3214,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 {
@@ -3260,8 +3275,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)')
@@ -3276,7 +3292,8 @@ function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
}) })
}) })
} }
}) }).catch(reject)
}, 0)
}) })
} }

File diff suppressed because one or more lines are too long

6
y.js

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long