From b1a7f8d4a2910be276f29a0e7b35969a80b18530 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Sat, 19 Aug 2017 20:49:13 -0500
Subject: [PATCH] Fix stylelint popup code & use codemirror

---
 _locales/en/messages.json                 | 13 ++--
 edit/lint.js                              | 75 ++++++++++++++++++-----
 vendor/codemirror/addon/lint/json-lint.js | 37 +++++++++++
 3 files changed, 101 insertions(+), 24 deletions(-)
 create mode 100644 vendor/codemirror/addon/lint/json-lint.js

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 8f7db9cd..09106dd0 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -511,18 +511,17 @@
     "description": "Label for the button to remove a section"
   },
   "setStylelintLink": {
-    "message": "Get a full list of rules from $link$",
-    "description": "Stylelint rules link",
-    "placeholders": {
-      "link": {
-        "content": "$1"
-      }
-    }
+    "message": "Get a full list of rules",
+    "description": "Stylelint rules label before link"
   },
   "setStylelintRules": {
     "message": "Set stylelint rules",
     "description": "Stylelint popup header"
   },
+  "resetStylelintRules": {
+    "message": "Reset",
+    "description": "Reset stylelint rules"
+  },
   "setStylelintError": {
     "message": "Invalid JSON format",
     "description": "Stylelint invalid JSON message"
diff --git a/edit/lint.js b/edit/lint.js
index d561d32d..2d00f8a0 100644
--- a/edit/lint.js
+++ b/edit/lint.js
@@ -1,4 +1,5 @@
-/* global CodeMirror CSSLint editors makeSectionVisible showHelp stylelintDefaultConfig */
+/* global CodeMirror CSSLint editors makeSectionVisible showHelp showCodeMirrorPopup */
+/* global stylelintDefaultConfig onDOMscripted */
 'use strict';
 
 function initLint() {
@@ -204,11 +205,11 @@ function showLintHelp() {
   return showHelp(t('issues'), header + list + '</ul>');
 }
 
-function setupStylelintSettingsEvents() {
+function setupStylelintSettingsEvents(popup) {
   let timer;
-  $('#help-popup .save').addEventListener('click', event => {
+  popup.querySelector('.save').addEventListener('click', event => {
     event.preventDefault();
-    const json = tryJSONparse($('#help-popup textarea').value);
+    const json = tryJSONparse(popup.codebox.getValue());
     if (json && json.rules) {
       setStylelintRules(json.rules);
       // it is possible to have stylelint rules popup open & switch to csslint
@@ -227,10 +228,10 @@ function setupStylelintSettingsEvents() {
       }, 3000);
     }
   });
-  $('#help-popup .reset').addEventListener('click', event => {
+  popup.querySelector('reset').addEventListener('click', event => {
     event.preventDefault();
     setStylelintRules();
-    $('#help-popup .settings').value = JSON.stringify({rules: stylelintDefaultConfig.rules}, null, 2);
+    popup.codebox.setValue(JSON.stringify({rules: stylelintDefaultConfig.rules}, null, 2));
     if (prefs.get('editor.linter') === 'stylelint') {
       updateLinter('stylelint');
     }
@@ -239,16 +240,56 @@ function setupStylelintSettingsEvents() {
 
 function openStylelintSettings() {
   BG.chromeLocal.getValue('editorStylelintRules').then((rules = stylelintDefaultConfig.rules) => {
-    const link = '<a target="_blank" href="https://stylelint.io/demo/">Stylelint</a>';
-    const text = JSON.stringify({rules: rules}, null, 2);
-    const content = `<textarea class="contents settings">${text}</textarea>
-      <p>${t('setStylelintLink', link)}</p>
-      <button class="save" type="button">Save</button>&nbsp;
-      <button class="reset" type="button">Reset</button>
-      <span class="error">
-        ${t('setStylelintError')} (<a target="_blank" href="https://jsonlint.com/">JSONLint</a>)
-      </span>`;
-    showHelp(t('setStylelintRules'), content);
-    setupStylelintSettingsEvents();
+    const rulesString = JSON.stringify({rules: rules}, null, 2);
+    setupStylelintPopup(rulesString);
   });
 }
+
+function setupStylelintPopup(rules) {
+  function makeButton(className, text) {
+    return $element({tag: 'button', className, type: 'button', textContent: t(text)});
+  }
+  function makeLink(url, textContent) {
+    return $element({tag: 'a', target: '_blank', href: url, textContent});
+  }
+  function setJSONMode(cm) {
+    cm.setOption('mode', 'application/json');
+  }
+  const popup = showCodeMirrorPopup(t('setStylelintRules'), $element({
+    className: 'contents',
+    appendChild: [
+      $element({
+        tag: 'p',
+        appendChild: [
+          t('setStylelintLink') + ' ',
+          makeLink('https://stylelint.io/demo/', 'Stylelint')
+        ]
+      }),
+      makeButton('save', 'styleSaveLabel'),
+      makeButton('reset', 'resetStylelintRules'),
+      $element({
+        tag: 'span',
+        className: 'error',
+        appendChild: [
+          t('setStylelintError'),
+          makeLink('https://jsonlint.com/', 'Stylelint')
+        ]
+      })
+    ]
+  }));
+  const contents = popup.querySelector('.contents');
+  contents.insertBefore(popup.codebox.display.wrapper, contents.firstElementChild);
+  popup.codebox.focus();
+  popup.codebox.setValue(rules);
+  if (!$('script[src*="json-lint.js"]')) {
+    onDOMscripted(
+      ['vendor/codemirror/addon/lint/json-lint.js'],
+      () => {
+        setJSONMode(popup.codebox);
+      }
+    );
+  } else {
+    setJSONMode(popup.codebox);
+  }
+  setupStylelintSettingsEvents(popup);
+}
diff --git a/vendor/codemirror/addon/lint/json-lint.js b/vendor/codemirror/addon/lint/json-lint.js
new file mode 100644
index 00000000..849641ee
--- /dev/null
+++ b/vendor/codemirror/addon/lint/json-lint.js
@@ -0,0 +1,37 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Depends on jsonlint.js from https://github.com/zaach/jsonlint
+
+// declare global: jsonlint
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("lint", "json", function(text) {
+  var found = [];
+  if (!window.jsonlint) {
+    if (window.console) {
+      window.console.error("Error: window.jsonlint not defined, CodeMirror JSON linting cannot run.");
+    }
+    return found;
+  }
+  jsonlint.parseError = function(str, hash) {
+    var loc = hash.loc;
+    found.push({from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),
+                to: CodeMirror.Pos(loc.last_line - 1, loc.last_column),
+                message: str});
+  };
+  try { jsonlint.parse(text); }
+  catch(e) {}
+  return found;
+});
+
+});