usercss: use cm.changeGeneration() to detect dirtiness

edit/codemirror-default.js

@@ -113,9 +113,16 @@
     uso: 'css'
   };
 
-  CodeMirror.defineExtension('setPreprocessor', function (preprocessor) {
+  CodeMirror.defineExtension('setPreprocessor', function (preprocessor, force = false) {
     const mode = MODE[preprocessor] || 'css';
-    return loadScript(mode !== 'css' && `/vendor/codemirror/mode/${mode}/${mode}.js`).then(() => {
+    if ((this.doc.mode || {}).name === mode && !force) {
+      return Promise.resolve();
+    }
+    if (mode === 'css') {
+      this.setOption('mode', mode);
+      return Promise.resolve();
+    }
+    return loadScript(`/vendor/codemirror/mode/${mode}/${mode}.js`).then(() => {
       this.setOption('mode', mode);
     });
   });

edit/edit.js

@@ -1939,46 +1939,20 @@ function showCodeMirrorPopup(title, html, options) {
 
 chrome.runtime.onMessage.addListener(onRuntimeMessage);
 
-function replaceStyle(request) {
-  const codeIsUpdated = request.codeIsUpdated !== false;
-  if (!isUsercss(request.style)) {
-    initWithSectionStyle(request);
-    return;
-  }
-  if (!codeIsUpdated) {
-    editor.replaceMeta(request.style);
-    return;
-  }
-
-  askDiscardChanges()
-    .then(result => {
-      if (result) {
-        editor.replaceStyle(request.style);
-      } else {
-        editor.setStyleDirty(request.style);
-      }
-    });
-
-  function askDiscardChanges() {
-    if (!editor.isTouched()) {
-      return Promise.resolve(true);
-    }
-    return messageBox.confirm(t('styleUpdateDiscardChanges'));
-  }
-}
-
 function onRuntimeMessage(request) {
   switch (request.method) {
     case 'styleUpdated':
-      if (styleId && styleId === request.style.id && request.reason !== 'editSave' && request.reason !== 'config') {
+      if (styleId && styleId === request.style.id &&
+          request.reason !== 'editSave' &&
+          request.reason !== 'config') {
+        // code-less style from notifyAllTabs
         if ((request.style.sections[0] || {}).code === null) {
-          // the code-less style came from notifyAllTabs
+          request.style = BG.cachedStyles.byId.get(request.style.id);
-          onBackgroundReady().then(() => {
+        }
-            request.style = BG.cachedStyles.byId.get(request.style.id);
+        if (isUsercss(request.style)) {
-            replaceStyle(request);
+          editor.replaceStyle(request.style, request.codeIsUpdated);
-          });
         } else {
-          replaceStyle(request);
+          initWithSectionStyle(request);
         }
       }
       break;

edit/source-editor.js

@@ -8,6 +8,7 @@
 function createSourceEditor(style) {
   // a flag for isTouched()
   let hadBeenSaved = false;
+  let savedGeneration = 0;
 
   $('#name').disabled = true;
   $('#mozilla-format-container').remove();
@@ -18,9 +19,8 @@ function createSourceEditor(style) {
 
   const dirty = dirtyReporter();
   dirty.onChange(() => {
-    const DIRTY = dirty.isDirty();
+    document.body.classList.toggle('dirty', dirty.isDirty());
-    document.body.classList.toggle('dirty', DIRTY);
+    $('#save-button').disabled = !dirty.isDirty();
-    $('#save-button').disabled = !DIRTY;
     updateTitle();
   });
 
@@ -41,6 +41,7 @@ function createSourceEditor(style) {
     cm.setValue(style.sourceCode);
     cm.clearHistory();
     cm.markClean();
+    savedGeneration = cm.changeGeneration();
 
     initHooks();
     initAppliesToLineWidget();
@@ -101,7 +102,7 @@ function createSourceEditor(style) {
       
       ${section}
     `.replace(/^\s+/gm, '');
-    dirty.clear('source');
+    dirty.clear('sourceGeneration');
     style.sourceCode = '';
     BG.chromeSync.getLZValue('usercssTemplate').then(code => {
       style.sourceCode = code || DEFAULT_CODE;
@@ -110,45 +111,35 @@ function createSourceEditor(style) {
       cm.clearHistory();
       cm.markClean();
       cm.endOperation();
+      dirty.clear('sourceGeneration');
+      savedGeneration = cm.changeGeneration();
     });
   }
 
   function initHooks() {
-    // sidebar commands
     $('#save-button').onclick = save;
     $('#beautify').onclick = beautify;
     $('#keyMap-help').onclick = showKeyMapHelp;
     $('#toggle-style-help').onclick = showToggleStyleHelp;
     $('#cancel-button').onclick = goBackToManage;
 
-    // enable
+    $('#enabled').onchange = function () {
-    $('#enabled').onchange = e => {
+      const value = this.checked;
-      const value = e.target.checked;
       dirty.modify('enabled', style.enabled, value);
       style.enabled = value;
     };
 
-    // source
+    cm.on('changes', () => {
-    cm.on('change', () => {
+      dirty.modify('sourceGeneration', savedGeneration, cm.changeGeneration());
-      const value = cm.getValue();
-      dirty.modify('source', style.sourceCode, value);
-      style.sourceCode = value;
-
       updateLintReportIfEnabled(cm);
     });
 
-    // hotkeyRerouter
+    cm.on('focus', () => hotkeyRerouter.setState(false));
-    cm.on('focus', () => {
+    cm.on('blur', () => hotkeyRerouter.setState(true));
-      hotkeyRerouter.setState(false);
-    });
-    cm.on('blur', () => {
-      hotkeyRerouter.setState(true);
-    });
 
-    // autocomplete
+    //if (prefs.get('editor.autocompleteOnTyping')) {
-    if (prefs.get('editor.autocompleteOnTyping')) {
+    //  setupAutocomplete(cm);
-      setupAutocomplete(cm);
+    //}
-    }
   }
 
   function updateMeta() {
@@ -170,25 +161,36 @@ function createSourceEditor(style) {
     }
   }
 
-  function replaceStyle(newStyle) {
+  function replaceStyle(newStyle, codeIsUpdated) {
-    if (!style.id && newStyle.id) {
+    const sameCode = newStyle.sourceCode === cm.getValue();
-      history.replaceState({}, '', `?id=${newStyle.id}`);
+    hadBeenSaved = sameCode;
+    if (sameCode) {
+      savedGeneration = cm.changeGeneration();
+      dirty.clear('sourceGeneration');
     }
-    style = deepCopy(newStyle);
+    if (codeIsUpdated === false || sameCode) {
-    updateMeta();
+      style.enabled = newStyle.enabled;
-    if (style.sourceCode !== cm.getValue()) {
+      dirty.clear('enabled');
-      const cursor = cm.getCursor();
+      updateMeta();
-      cm.setValue(style.sourceCode);
+      return;
-      cm.setCursor(cursor);
     }
-    dirty.clear();
+    Promise.resolve(messageBox.confirm(t('styleUpdateDiscardChanges'))).then(ok => {
-    hadBeenSaved = false;
+      if (!ok) {
-  }
+        return;
-
+      }
-  function setStyleDirty(newStyle) {
+      if (!style.id && newStyle.id) {
-    dirty.clear();
+        history.replaceState({}, '', `?id=${newStyle.id}`);
-    dirty.modify('source', newStyle.sourceCode, style.sourceCode);
+      }
-    dirty.modify('enabled', newStyle.enabled, style.enabled);
+      style = deepCopy(newStyle);
+      updateMeta();
+      if (!sameCode) {
+        const cursor = cm.getCursor();
+        cm.setValue(style.sourceCode);
+        cm.setCursor(cursor);
+        savedGeneration = cm.changeGeneration();
+      }
+      dirty.clear();
+    });
   }
 
   function toggleStyle() {
@@ -209,12 +211,9 @@ function createSourceEditor(style) {
         reason: 'editSave',
         id: style.id,
         enabled: style.enabled,
-        sourceCode: style.sourceCode
+        sourceCode: cm.getValue(),
       }))
       .then(replaceStyle)
-      .then(() => {
-        hadBeenSaved = true;
-      })
       .catch(err => {
         if (err.message === t('styleMissingMeta', 'name')) {
           messageBox.confirm(t('usercssReplaceTemplateConfirmation')).then(ok => ok &&
@@ -257,16 +256,8 @@ function createSourceEditor(style) {
     return dirty.isDirty() || hadBeenSaved;
   }
 
-  function replaceMeta(newStyle) {
-    style.enabled = newStyle.enabled;
-    dirty.clear('enabled');
-    updateMeta();
-  }
-
   return {
     replaceStyle,
-    replaceMeta,
-    setStyleDirty,
     save,
     toggleStyle,
     isDirty: dirty.isDirty,