Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit dfc1341

Browse files
author
Marcel Gerber
committed
Ensure _marker is not null
1 parent 5ed4ee4 commit dfc1341

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

src/extensions/default/InlineColorEditor/InlineColorEditor.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ define(function (require, exports, module) {
9090
InlineColorEditor.prototype.getCurrentRange = function () {
9191
var pos, start, end;
9292

93-
pos = this._marker.find();
93+
pos = this._marker && this._marker.find();
9494

9595
start = pos && pos.from;
9696
if (!start) {
@@ -150,8 +150,10 @@ define(function (require, exports, module) {
150150
self.hostEditor.setSelection(range.start, range.end); // workaround for #2805
151151
self.hostEditor.document.replaceRange(colorString, range.start, range.end, self._origin);
152152
self.hostEditor.setSelection(range.start, endPos);
153-
self._marker.clear();
154-
self._marker = self.hostEditor._codeMirror.markText(range.start, endPos);
153+
if (self._marker) {
154+
self._marker.clear();
155+
self._marker = self.hostEditor._codeMirror.markText(range.start, endPos);
156+
}
155157
});
156158
this._isOwnChange = false;
157159
}

0 commit comments

Comments
 (0)