From b020b243e912024d7ff155edc16682327859a15c Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Sun, 27 Sep 2015 17:00:16 +0200 Subject: [PATCH] removed some duplicate code --- src/mixins/itext_behavior.mixin.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mixins/itext_behavior.mixin.js b/src/mixins/itext_behavior.mixin.js index 1e790760..44b9870f 100644 --- a/src/mixins/itext_behavior.mixin.js +++ b/src/mixins/itext_behavior.mixin.js @@ -703,35 +703,35 @@ lineIndex = cursorLocation.lineIndex, charIndex = cursorLocation.charIndex; - if (isBeginningOfLine) { + this._removeStyleObject(isBeginningOfLine, cursorLocation, lineIndex, charIndex); + }, - var textOnPreviousLine = this._textLines[lineIndex - 1], - newCharIndexOnPrevLine = textOnPreviousLine - ? textOnPreviousLine.length - : 0; + _getTextOnPreviousLine: function(lIndex) { + return this._textLines[lIndex - 1]; + }, + + _removeStyleObject: function(isBeginningOfLine, cursorLocation, lineIndex, charIndex) { + + if (isBeginningOfLine) { + var textOnPreviousLine = this._getTextOnPreviousLine(cursorLocation.lineIndex), + newCharIndexOnPrevLine = textOnPreviousLine ? textOnPreviousLine.length : 0; if (!this.styles[lineIndex - 1]) { this.styles[lineIndex - 1] = {}; } - for (charIndex in this.styles[lineIndex]) { this.styles[lineIndex - 1][parseInt(charIndex, 10) + newCharIndexOnPrevLine] = this.styles[lineIndex][charIndex]; } - - this.shiftLineStyles(lineIndex, -1); - + this.shiftLineStyles(cursorLocation.lineIndex, -1); } else { var currentLineStyles = this.styles[lineIndex]; if (currentLineStyles) { delete currentLineStyles[charIndex]; - //console.log('deleting', lineIndex, charIndex + offset); } - var currentLineStylesCloned = clone(currentLineStyles); - // shift all styles by 1 backwards for (var i in currentLineStylesCloned) { var numericIndex = parseInt(i, 10);