Просмотр исходного кода

fix: skip namespace conflict checking for upgradation

Gerald 9 лет назад
Родитель
Сommit
0ba9081028
5 измененных файлов с 8 добавлено и 3 удалено
  1. 2 1
      package.json
  2. 1 1
      src/background/db.js
  3. 1 1
      src/manifest.json
  4. 3 0
      src/options/views/edit.js
  5. 1 0
      src/options/views/tab-settings.js

+ 2 - 1
package.json

@@ -5,7 +5,8 @@
     "clean": "node -e \"require('del')(['dist'])\"",
     "dev": "gulp build && gulp watch",
     "i18n": "gulp i18n",
-    "update": "node scripts/updateLib"
+    "update": "node scripts/updateLib",
+    "version": "gulp build"
   },
   "description": "Violentmonkey",
   "devDependencies": {

+ 1 - 1
src/background/db.js

@@ -540,7 +540,7 @@ VMDB.prototype.parseScript = function (data) {
     });
   return _this.queryScript(data.id, meta, tx).then(function (script) {
     if (script) {
-      if (!data.id) throw _.i18n('msgNamespaceConflict');
+      if (data.isNew) throw _.i18n('msgNamespaceConflict');
     } else {
       script = scriptUtils.newScript();
       res.cmd = 'add';

+ 1 - 1
src/manifest.json

@@ -7,7 +7,7 @@
     "name": "Gerald",
     "url": "http://gerald.top"
   },
-  "homepage_url": "http://gerald.top/code/vm?from=nex",
+  "homepage_url": "https://violentmonkey.github.io/violentmonkey/",
   "icons": {
     "16": "images/icon16.png",
     "48": "images/icon48.png",

+ 3 - 0
src/options/views/edit.js

@@ -61,6 +61,9 @@ var EditView = BaseView.extend({
       data: {
         id: data.id,
         code: data.code,
+        // User created scripts MUST be marked `isNew` so that
+        // the backend is able to check namespace conflicts
+        isNew: !data.id,
         message: '',
         more: {
           custom: data.custom,

+ 1 - 0
src/options/views/tab-settings.js

@@ -31,6 +31,7 @@ var ExportList = BaseView.extend({
 
 var SettingsTab = BaseView.extend({
   el: '#tab',
+  name: 'settings',
   events: {
     'change [data-check]': 'updateCheckbox',
     'change #sInjectMode': 'updateInjectMode',