open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix and update ColorView.openPopup()

Browse Source
This commit is contained in:
tophf 2017-11-21 18:38:07 +03:00
parent ce8a0a2d42
commit 352846c8b4
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
vendor-overwrites/colorpicker/colorview.js
View File

@ -397,25 +397,18 @@
this.cm.state.colorpicker = null; this.cm.state.colorpicker = null;
} }
openPopup(defaultColor = '#FFFFFF') { openPopup(color) {
const cursor = this.cm.getCursor(); let {line, ch} = this.cm.getCursor();
const data = { const lineText = this.cm.getLine(line);
line: cursor.line, ch -= (lineText.lastIndexOf('!important', ch) >= ch - '!important'.length) ? '!important'.length : 0;
ch: cursor.ch, const lineCache = this.cm.state.colorpicker.cache.get(lineText);
color: defaultColor, const data = {line, ch, color, isShortCut: true};
isShortCut: true, for (const [start, {color, colorValue}] of lineCache && lineCache.entries() || []) {
}; if (start <= ch && ch <= start + color.length) {
for (const {from, marker} of this.cm.getLineHandle(cursor.line).markedSpans || []) { Object.assign(data, {ch: start, color, colorValue});
if (from <= data.ch && (marker.replacedWith || {}).colorpickerData) {
const {color, colorValue} = marker.replacedWith.colorpickerData;
if (data.ch <= from + color.length) {
data.ch = from;
data.color = color;
data.colorValue = colorValue;
break; break;
} }
} }
}
this.openPopupForToken({colorpickerData: data}); this.openPopupForToken({colorpickerData: data});
} }
@ -426,8 +419,8 @@
top, top,
left, left,
cm: this.cm, cm: this.cm,
color: data.colorValue || data.color, color: data.colorValue || data.color || '#fff',
prevColor: data.color, prevColor: data.color || '',
isShortCut: false, isShortCut: false,
callback: ColorMarker.popupOnChange, callback: ColorMarker.popupOnChange,
})); }));