1
0
mirror of https://github.com/chinchang/web-maker.git synced 2025-08-02 11:30:22 +02:00

save modes in storage.

This commit is contained in:
Kushagra Gour
2016-07-14 02:27:55 +05:30
parent 45aa1d1e7d
commit ad3c605649
2 changed files with 22 additions and 14 deletions

View File

@@ -301,7 +301,7 @@
overflow: hidden; overflow: hidden;
opacity: 0; opacity: 0;
visibility: hidden; visibility: hidden;
transition: 0.3s ease; transition: 0.25s ease;
transform: translateY(10px); transform: translateY(10px);
z-index: 5; z-index: 5;
background: white; background: white;
@@ -340,9 +340,9 @@
<div class="btn-group" dropdown> <div class="btn-group" dropdown>
<span id="js-css-mode-label">CSS</span><span class="caret"></span> <span id="js-css-mode-label">CSS</span><span class="caret"></span>
<ul class="js-modes-menu dropdown__menu"> <ul class="js-modes-menu dropdown__menu">
<li><a data-mode-type="css" data-mode="css">CSS</a></li> <li><a data-type="css" data-mode="css">CSS</a></li>
<li><a data-mode-type="css" data-mode="scss">SCSS</a></li> <li><a data-type="css" data-mode="scss">SCSS</a></li>
<li><a data-mode-type="css" data-mode="less">LESS</a></li> <li><a data-type="css" data-mode="less">LESS</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -352,9 +352,9 @@
<div class="btn-group" dropdown> <div class="btn-group" dropdown>
<span id="js-js-mode-label">JS</span><span class="caret"></span> <span id="js-js-mode-label">JS</span><span class="caret"></span>
<ul class="js-modes-menu dropdown__menu"> <ul class="js-modes-menu dropdown__menu">
<li><a data-mode-type="js" data-mode="js">JS</a></li> <li><a data-type="js" data-mode="js">JS</a></li>
<li><a data-mode-type="js" data-mode="coffee">CoffeeScript</a></li> <li><a data-type="js" data-mode="coffee">CoffeeScript</a></li>
<li><a data-mode-type="js" data-mode="es6">ES6 (Babel)</a></li> <li><a data-type="js" data-mode="es6">ES6 (Babel)</a></li>
</ul> </ul>
</div> </div>
</div> </div>

View File

@@ -128,11 +128,17 @@
cssMode = value; cssMode = value;
cssModelLabel.textContent = value; cssModelLabel.textContent = value;
editur.cm.css.setOption('mode', value); editur.cm.css.setOption('mode', value);
chrome.storage.sync.set({
cssMode: value
}, function () {});
} }
function updateJsMode(value) { function updateJsMode(value) {
jsMode = value; jsMode = value;
jsModelLabel.textContent = value; jsModelLabel.textContent = value;
editur.cm.js.setOption('mode', value); editur.cm.js.setOption('mode', value);
chrome.storage.sync.set({
jsMode: value
}, function () {});
} }
function computeHtml() { function computeHtml() {
return editur.cm.html.getValue(); return editur.cm.html.getValue();
@@ -203,9 +209,9 @@
editur.setPreviewContent = function () { editur.setPreviewContent = function () {
var html = computeHtml(); var html = computeHtml();
var cssPromise = css = computeCss(); var cssPromise = computeCss();
var js = computeJs(); var jsPromise = computeJs();
Promise.all([html, cssPromise, js]).then(function (result) { Promise.all([html, cssPromise, jsPromise]).then(function (result) {
createPreviewFile(result[0], result[1], result[2]); createPreviewFile(result[0], result[1], result[2]);
}); });
}; };
@@ -321,7 +327,7 @@
var type = e.currentTarget.dataset.type; var type = e.currentTarget.dataset.type;
var currentMode = type === 'js' ? jsMode : cssMode; var currentMode = type === 'js' ? jsMode : cssMode;
if (currentMode !== mode) { if (currentMode !== mode) {
if (type = 'js') { if (type === 'js') {
updateJsMode(mode); updateJsMode(mode);
} else { } else {
updateCssMode(mode); updateCssMode(mode);
@@ -329,8 +335,6 @@
} }
}); });
}); });
updateJsMode(jsMode);
updateCssMode(cssMode);
window.addEventListener('keydown', function (event) { window.addEventListener('keydown', function (event) {
if ((event.ctrlKey || event.metaKey) && (event.keyCode === 83)){ if ((event.ctrlKey || event.metaKey) && (event.keyCode === 83)){
@@ -375,7 +379,9 @@
// Get synced `preserveLastCode` setting to get back last code (or not). // Get synced `preserveLastCode` setting to get back last code (or not).
chrome.storage.sync.get({ chrome.storage.sync.get({
preserveLastCode: true preserveLastCode: true,
jsMode: 'js',
cssMode: 'css'
}, function syncGetCallback(result) { }, function syncGetCallback(result) {
if (result.preserveLastCode && lastCode) { if (result.preserveLastCode && lastCode) {
editur.cm.html.setValue(lastCode.html); editur.cm.html.setValue(lastCode.html);
@@ -385,6 +391,8 @@
editur.cm.css.refresh(); editur.cm.css.refresh();
editur.cm.js.refresh(); editur.cm.js.refresh();
} }
updateJsMode(result.jsMode);
updateCssMode(result.cssMode);
}); });
// Check for new version notifications // Check for new version notifications