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

customizeOpenDialog, openDialog, and originalOpenConfirm now use cloned template instead of innerHTML

Browse Source
This commit is contained in:
Jeremy Schomery 2017-07-19 13:43:21 +04:30 committed by tophf
parent 0e9c8f290c
commit 5d46dcc33e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
edit/edit.js
View File

@ -261,7 +261,6 @@ function initCodeMirror() {
// initialize global editor controls // initialize global editor controls
function optionsFromArray(parent, options) { function optionsFromArray(parent, options) {
console.log(parent, options);
options.map(opt => $element({tag: 'option', textContent: opt})) options.map(opt => $element({tag: 'option', textContent: opt}))
.forEach(opt => parent.appendChild(opt)); .forEach(opt => parent.appendChild(opt));
} }
@ -690,11 +689,11 @@ function setupGlobalSearch() {
return cm.state.search; return cm.state.search;
} }
// temporarily overrides the original openDialog with the provided template's innerHTML // overrides the original openDialog with a clone of the provided template
function customizeOpenDialog(cm, template, callback) { function customizeOpenDialog(cm, template, callback) {
cm.openDialog = (tmpl, cb, opt) => { cm.openDialog = (tmpl, cb, opt) => {
// invoke 'callback' and bind 'this' to the original callback // invoke 'callback' and bind 'this' to the original callback
originalOpenDialog.call(cm, template.innerHTML, callback.bind(cb), opt); originalOpenDialog.call(cm, template.cloneNode(true), callback.bind(cb), opt);
}; };
setTimeout(() => { cm.openDialog = originalOpenDialog; }, 0); setTimeout(() => { cm.openDialog = originalOpenDialog; }, 0);
refocusMinidialog(cm); refocusMinidialog(cm);
@ -873,7 +872,7 @@ function setupGlobalSearch() {
doReplace(); doReplace();
} }
}); });
originalOpenConfirm.call(cm, template.replaceConfirm.innerHTML, ovrCallbacks, opt); originalOpenConfirm.call(cm, template.replaceConfirm.cloneNode(true), ovrCallbacks, opt);
}; };
} }
} }
@ -892,7 +891,7 @@ function setupGlobalSearch() {
function jumpToLine(cm) { function jumpToLine(cm) {
const cur = cm.getCursor(); const cur = cm.getCursor();
refocusMinidialog(cm); refocusMinidialog(cm);
cm.openDialog(template.jumpToLine.innerHTML, str => { cm.openDialog(template.jumpToLine.cloneNode(true), str => {
const m = str.match(/^\s*(\d+)(?:\s*:\s*(\d+))?\s*$/); const m = str.match(/^\s*(\d+)(?:\s*:\s*(\d+))?\s*$/);
if (m) { if (m) {
cm.setCursor(m[1] - 1, m[2] ? m[2] - 1 : cur.ch); cm.setCursor(m[1] - 1, m[2] ? m[2] - 1 : cur.ch);