From 3b0d0343f4447e15be2165943ab3a51980439141 Mon Sep 17 00:00:00 2001
From: Kevin Jahns <kevin.jahns@rwth-aachen.de>
Date: Mon, 1 Aug 2016 17:04:06 +0200
Subject: [PATCH] Release 11.2.2
---
dist | 2 +-
gulpfile.helper.js | 4 ++--
package.json | 2 +-
src/SpecHelper.js | 9 ++++-----
src/Utils.js | 6 +++---
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/dist b/dist
index 5ab60028..653a436b 160000
--- a/dist
+++ b/dist
@@ -1 +1 @@
-Subproject commit 5ab60028ce3cdabbefcce00a217155d9a209a0f6
+Subproject commit 653a436b8874ea2fd329404f1bd92fd3c808595e
diff --git a/gulpfile.helper.js b/gulpfile.helper.js
index fd538272..18c3ec48 100644
--- a/gulpfile.helper.js
+++ b/gulpfile.helper.js
@@ -48,8 +48,8 @@ module.exports = function (gulp, helperOptions) {
.pipe(source(options.targetName))
.pipe(buffer())
.pipe($.sourcemaps.init({loadMaps: true}))
- .pipe($.if(!options.debug, $.uglify().on('error', function(e) {
- console.log('\x07',e.message, JSON.stringify(e)); return this.end()
+ .pipe($.if(!options.debug, $.uglify().on('error', function (e) {
+ console.log('\x07', e.message, JSON.stringify(e)); return this.end()
})))
.pipe($.sourcemaps.write('.'))
.pipe(gulp.dest('./dist/')))
diff --git a/package.json b/package.json
index 1e34870b..66dfaee1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "yjs",
- "version": "11.2.1",
+ "version": "11.2.2",
"description": "A framework for real-time p2p shared editing on arbitrary complex data types",
"main": "./src/y.js",
"scripts": {
diff --git a/src/SpecHelper.js b/src/SpecHelper.js
index 4d09d25f..0689d874 100644
--- a/src/SpecHelper.js
+++ b/src/SpecHelper.js
@@ -27,20 +27,19 @@ g.g = g
// Helper methods for the random number generator
Math.seedrandom = require('seedrandom')
-g.generateRandomSeed = function generateRandomSeed() {
+g.generateRandomSeed = function generateRandomSeed () {
var seed
- if (typeof window != 'undefined' && window.location.hash.length > 1) {
+ if (typeof window !== 'undefined' && window.location.hash.length > 1) {
seed = window.location.hash.slice(1) // first character is the hash!
console.warn('Using random seed that was specified in the url!')
} else {
seed = JSON.stringify(Math.random())
}
console.info('Using random seed: ' + seed)
- setRandomSeed(seed)
-
+ g.setRandomSeed(seed)
}
-g.setRandomSeed = function setRandomSeed(seed) {
+g.setRandomSeed = function setRandomSeed (seed) {
Math.seedrandom.currentSeed = seed
Math.seedrandom(Math.seedrandom.currentSeed, { global: true })
}
diff --git a/src/Utils.js b/src/Utils.js
index 5c37102f..1b6bfe77 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -94,7 +94,7 @@ module.exports = function (Y /* : any*/) {
this.onevent(op)
} else if (op.struct === 'Delete') {
var self = this
- function checkDelete (d) {
+ var checkDelete = function checkDelete (d) {
if (d.length == null) {
throw new Error('This shouldn\'t happen! d.length must be defined!')
}
@@ -205,7 +205,7 @@ module.exports = function (Y /* : any*/) {
*/
if (iEnd < dEnd) {
// Case 7
- debugger
+ // debugger // TODO: You did not test this case yet!!!! (add the debugger here)
self.waiting.splice(w, 1)
checkDelete({
target: [d.target[0], dStart],
@@ -336,7 +336,7 @@ module.exports = function (Y /* : any*/) {
break
}
}
- for (var i = 0; i < dels.length; i++) {
+ for (i = 0; i < dels.length; i++) {
if (this.awaiting === 0) {
this.onevent(dels[i])
} else {
--
GitLab