fixed bug in array & richtext
This commit is contained in:
parent
bc856a09f5
commit
e77a753708
@ -48,7 +48,9 @@ module.exports = function (gulp, helperOptions) {
|
|||||||
.pipe(source(options.targetName))
|
.pipe(source(options.targetName))
|
||||||
.pipe(buffer())
|
.pipe(buffer())
|
||||||
.pipe($.sourcemaps.init({loadMaps: true}))
|
.pipe($.sourcemaps.init({loadMaps: true}))
|
||||||
.pipe($.if(!options.debug, $.uglify()))
|
.pipe($.if(!options.debug, $.uglify().on('error', function(e) {
|
||||||
|
console.log('\x07',e.message, JSON.stringify(e)); return this.end()
|
||||||
|
})))
|
||||||
.pipe($.sourcemaps.write('.'))
|
.pipe($.sourcemaps.write('.'))
|
||||||
.pipe(gulp.dest('./dist/')))
|
.pipe(gulp.dest('./dist/')))
|
||||||
})
|
})
|
||||||
|
@ -367,12 +367,16 @@ module.exports = function (Y /* :any */) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (defined == null) {
|
if (defined == null) {
|
||||||
var isGarbageCollected = yield* this.isGarbageCollected(op.id)
|
var opid = op.id
|
||||||
|
var isGarbageCollected = yield* this.isGarbageCollected(opid)
|
||||||
if (!isGarbageCollected) {
|
if (!isGarbageCollected) {
|
||||||
yield* Y.Struct[op.struct].execute.call(this, op)
|
yield* Y.Struct[op.struct].execute.call(this, op)
|
||||||
yield* this.addOperation(op)
|
yield* this.addOperation(op)
|
||||||
yield* this.store.operationAdded(this, op)
|
yield* this.store.operationAdded(this, op)
|
||||||
|
if (!Y.utils.compareIds(opid, op.id)) {
|
||||||
|
// operationAdded changed op
|
||||||
|
op = yield* this.getOperation(opid)
|
||||||
|
}
|
||||||
// if insertion, try to combine with left
|
// if insertion, try to combine with left
|
||||||
yield* this.tryCombineWithLeft(op)
|
yield* this.tryCombineWithLeft(op)
|
||||||
}
|
}
|
||||||
|
@ -74,7 +74,7 @@ function getRandomNumber (n) {
|
|||||||
g.getRandomNumber = getRandomNumber
|
g.getRandomNumber = getRandomNumber
|
||||||
|
|
||||||
function getRandomString () {
|
function getRandomString () {
|
||||||
var chars = 'abcdefäö'
|
var chars = 'abcdefghijklmnopqrstuvwxyzäüöABCDEFGHIJKLMNOPQRSTUVWXYZÄÜÖ'
|
||||||
var char = chars[getRandomNumber(chars.length)] // ü\n\n\n\n\n\n\n'
|
var char = chars[getRandomNumber(chars.length)] // ü\n\n\n\n\n\n\n'
|
||||||
var length = getRandomNumber(7)
|
var length = getRandomNumber(7)
|
||||||
var string = ''
|
var string = ''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user