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

Refactor: move alert/confirm util to msgbox.js

Browse Source
This commit is contained in:
eight 2017-11-09 14:35:10 +08:00
parent c2687573b3
commit ae50cbe12a
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
install-usercss/install-usercss.js
View File

@ -3,26 +3,6 @@
'use strict'; 'use strict';
(() => { (() => {
const dialog = (() => {
function alert(text) {
return messageBox({
contents: text,
className: 'pre center',
buttons: [t('confirmClose')]
});
}
function confirm(text) {
return messageBox({
contents: text,
className: 'pre center',
buttons: [t('confirmYes'), t('confirmNo')]
}).then(result => result.button === 0 || result.enter);
}
return {alert, confirm};
})();
const params = new URLSearchParams(location.search); const params = new URLSearchParams(location.search);
let liveReload = false; let liveReload = false;
let installed = false; let installed = false;
@ -36,14 +16,14 @@
switch (msg.method) { switch (msg.method) {
case 'getSourceCodeResponse': case 'getSourceCodeResponse':
if (msg.error) { if (msg.error) {
dialog.alert(msg.error); messageBox.alert(msg.error);
} else { } else {
initSourceCode(msg.sourceCode); initSourceCode(msg.sourceCode);
} }
break; break;
case 'sourceCodeChanged': case 'sourceCodeChanged':
if (msg.error) { if (msg.error) {
dialog.alert(msg.error); messageBox.alert(msg.error);
} else { } else {
liveReloadUpdate(msg.sourceCode); liveReloadUpdate(msg.sourceCode);
} }
@ -207,7 +187,7 @@
window.dispatchEvent(new CustomEvent('installed')); window.dispatchEvent(new CustomEvent('installed'));
}) })
.catch(err => { .catch(err => {
dialog.alert(chrome.i18n.getMessage('styleInstallFailed', String(err))); messageBox.alert(chrome.i18n.getMessage('styleInstallFailed', String(err)));
}); });
} }
@ -253,7 +233,7 @@
]) : ]) :
chrome.i18n.getMessage('styleInstall', [data.name]); chrome.i18n.getMessage('styleInstall', [data.name]);
dialog.confirm(message).then(result => { messageBox.confirm(message).then(result => {
if (result) { if (result) {
return install(style); return install(style);
} }

14
msgbox/msgbox.js
View File

@ -99,3 +99,17 @@ function messageBox({
messageBox.resolve = null; messageBox.resolve = null;
} }
} }
messageBox.alert = text =>
messageBox({
contents: text,
className: 'pre center',
buttons: [t('confirmClose')]
});
messageBox.confirm = text =>
messageBox({
contents: text,
className: 'pre center',
buttons: [t('confirmYes'), t('confirmNo')]
}).then(result => result.button === 0 || result.enter);