From cd00c20fa40b7aa6ae31088e3f5eeac2a5a8f3ba Mon Sep 17 00:00:00 2001
From: eight <eight04@gmail.com>
Date: Mon, 9 Oct 2017 00:52:05 +0800
Subject: [PATCH] Fix: newStyleFormat -> newStyleInUsercss

---
 _locales/en/messages.json |  7 ++-----
 edit/edit.js              |  2 +-
 js/prefs.js               |  2 +-
 options.html              | 10 +++++-----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index a56b4bab..64723f22 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -971,11 +971,8 @@
   "optionsAdvancedContextDelete": {
     "message": "Add 'Delete' in editor context menu"
   },
-  "optionsAdvancedNewStyleFormat": {
-    "message": "Format of newly created userstyle"
-  },
-  "optionsAdvancedNewStyleFormatRegular": {
-    "message": "Regular"
+  "optionsAdvancedNewStyleInUsercss": {
+    "message": "Write new style as usercss"
   },
   "optionsActions": {
     "message": "Actions"
diff --git a/edit/edit.js b/edit/edit.js
index cf2fae43..8ff3bc1c 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -1280,7 +1280,7 @@ function isUsercss(style) {
   if (style.usercssData) {
     return true;
   }
-  if (!style.id && prefs.get('newStyleFormat') === 'usercss') {
+  if (!style.id && prefs.get('newStyleInUsercss')) {
     return true;
   }
   return false;
diff --git a/js/prefs.js b/js/prefs.js
index 3bf477cb..c6506cb1 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -9,7 +9,7 @@ var prefs = new function Prefs() {
     'show-badge': true,             // display text on popup menu icon
     'disableAll': false,            // boss key
     'exposeIframes': false,         // Add 'stylus-iframe' attribute to HTML element in all iframes
-    'newStyleFormat': 'regular',    // 'regular' or 'usercss', the format of userstyle when creating a new style.
+    'newStyleInUsercss': false,     // create new style in usercss format
 
     'popup.breadcrumbs': true,      // display 'New style' links as URL breadcrumbs
     'popup.breadcrumbs.usePath': false, // use URL path for 'this URL'
diff --git a/options.html b/options.html
index df7bc482..7c96de70 100644
--- a/options.html
+++ b/options.html
@@ -123,11 +123,11 @@
           </span>
         </label>
         <label>
-          <span i18n-text="optionsAdvancedNewStyleFormat"></span>
-          <select id="newStyleFormat">
-            <option value="regular" i18n-text="optionsAdvancedNewStyleFormatRegular"></option>
-            <option value="usercss">Usercss</option>
-          </select>
+          <span i18n-text="optionsAdvancedNewStyleInUsercss"></span>
+          <span class="onoffswitch">
+            <input type="checkbox" id="newStyleInUsercss">
+            <span></span>
+          </span>
         </label>
       </div>
     </div>