Merge branch 'dev'

package.json

@@ -2,7 +2,7 @@
   "name": "Violentmonkey",
   "version": "2.5.0",
   "scripts": {
-    "clean": "gulp clean",
+    "prebuild": "gulp clean",
     "build": "gulp build",
     "dev": "gulp watch",
     "i18n": "gulp i18n",

src/background/sync/index.js

@@ -310,7 +310,12 @@ var BaseService = serviceFactory({
           if (xhr.status === 503) {
             // TODO Too Many Requests
           }
-          xhr.status > 300 ? requestError() : resolve(xhr.responseText);
+          // net error: xhr.status === 0
+          if (xhr.status >= 200 && xhr.status < 300) {
+            resolve(xhr.responseText);
+          } else {
+            requestError();
+          }
         };
         xhr.send(options.body);
 

src/popup/views/item.html

@@ -1,7 +1,7 @@
-<div class="menu-item" :class="[options.className,{disabled:options.disabled}]" :title="options.title||options.name">
-  <div class="menu-item-detail" v-if="options.detailClick" @click="detailClick">...</div>
+<div class="menu-item" :class="[data.className,{disabled:data.disabled}]" :title="data.title||data.name">
+  <div class="menu-item-detail" v-if="data.detailClick" @click="detailClick">...</div>
   <div class="menu-item-label" @click="onClick">
-    <svg class="icon"><use :xlink:href="'#'+options.symbol"/></svg>
-    {{options.name}}
+    <svg class="icon"><use :xlink:href="'#'+data.symbol"/></svg>
+    {{data.name}}
   </div>
 </div>

src/popup/views/item.js

@@ -13,14 +13,23 @@ module.exports = {
   props: ['options'],
   template: cache.get('./item.html'),
   data: function () {
-    // make options reactive
     return {
-      reactiveOptions: this.options,
+      data: {},
     };
   },
+  watch: {
+    options: 'update',
+  },
   methods: {
+    update: function () {
+      this.data = this.options;
+      this.init();
+    },
+    init: wrapHandler('init'),
     onClick: wrapHandler('onClick'),
     detailClick: wrapHandler('detailClick'),
   },
-  mounted: wrapHandler('init'),
+  mounted: function () {
+    this.update();
+  },
 };