Merge branch 'dev'

Author: gera2ld

package.json

@@ -3,32 +3,29 @@
   "version": "2.6.2",
   "description": "Violentmonkey for Maxthon",
   "scripts": {
-    "clean": "gulp clean",
+    "prebuild": "gulp clean",
     "build": "gulp build",
     "dev": "gulp watch",
     "i18n": "gulp i18n",
     "lint": "gulp lint",
     "update": "node scripts/update"
   },
   "devDependencies": {
-    "codemirror": "^5.14.2",
-    "define-commonjs": "^1.0.1",
     "del": "^2.2.0",
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.0",
     "gulp-cssnano": "^2.1.2",
-    "gulp-eslint": "^2.0.0",
+    "gulp-eslint": "^3.0.1",
     "gulp-filter": "^4.0.0",
     "gulp-footer": "^1.0.5",
     "gulp-svg-sprite": "^1.2.19",
-    "gulp-uglify": "^1.5.3",
+    "gulp-uglify": "^2.0.0",
     "gulp-util": "^3.0.4",
-    "html-minifier": "^2.1.0",
+    "html-minifier": "^3.2.3",
     "merge2": "^1.0.2",
     "ncp": "^2.0.0",
     "sync-promise-lite": "^0.2.3",
-    "through2": "^2.0.1",
-    "underscore": "^1.8.3"
+    "through2": "^2.0.3"
   },
   "author": "Gerald <i@gerald.top>",
   "repository": {
@@ -39,5 +36,10 @@
     "url": "https://github.com/violentmonkey/violentmonkey-mx/issues"
   },
   "homepage": "https://github.com/violentmonkey/violentmonkey-mx",
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {
+    "codemirror": "^5.23.0",
+    "define-commonjs": "^1.0.1",
+    "vue": "^2.1.10"
+  }
 }

scripts/update.js

@@ -33,6 +33,7 @@ const mappings = {
   CodeMirror: 'codemirror',
   'define.js': 'define-commonjs',
   'promise.js': 'sync-promise-lite',
+  'vue.min.js': 'vue/dist',
 };
 
 function updateFile(dest, src) {

src/background/app.js

@@ -314,3 +314,12 @@ vmdb.initialized.then(function () {
 _.setIcon('icon' + (_.options.get('isApplied') ? '' : 'w'));
 
 tabsUtils.on('TAB_SWITCH', badges.get);
+tabsUtils.on('ON_NAVIGATE', function (tab) {
+  // file:/// URLs will not be injected on Maxthon 5
+  if (/^file:\/\/\/.*?\.user\.js$/.test(tab.url)) {
+    commands.InstallScript({
+      url: tab.url,
+    });
+    _.tabs.remove(tab.id);
+  }
+});

src/common.js

@@ -18,6 +18,9 @@ polyfill(Object, 'assign', function () {
 polyfill(String.prototype, 'startsWith', function (str) {
   return this.slice(0, str.length) === str;
 });
+polyfill(String.prototype, 'endsWith', function (str) {
+  return this.slice(-str.length) === str;
+});
 polyfill(Array.prototype, 'findIndex', function (predicate) {
   var length = this.length;
   for (var i = 0; i < length; i ++) {

src/injected.js

@@ -784,7 +784,7 @@ function checkJS() {
     });
   }
 }
-if (/\.user\.js$/.test(location.pathname)) {
+if (!(/^file:\/\/\//.test(location.href)) && /\.user\.js$/.test(location.pathname)) {
   if (document.readyState == 'complete')
     checkJS();
   else

src/locale/cs-cz.yml

@@ -305,12 +305,14 @@ labelSearch:
 labelSearchFor:
   description: Text shown as a place holder in the search box.
   message: Hledat…
+  touched: false
 labelReplace:
   description: Label for replace input in search box.
   message: 'Nahradit: '
 labelReplaceWith:
   description: Text shown as a place holder in the replace box.
   message: Nahradit čím…
+  touched: false
 buttonReplace:
   description: Button to replace the current match.
   message: Nahradit
@@ -393,3 +395,6 @@ msgInvalidScript:
 menuScriptDisabled:
   description: 'Menu item showing the status of Violentmonkey, when disabled.'
   message: ''
+labelLineNumber:
+  description: Label for line number jumper.
+  message: ''

src/locale/en.yml

@@ -303,12 +303,14 @@ labelSearch:
 labelSearchFor:
   description: Text shown as a place holder in the search box.
   message: Search for...
+  touched: false
 labelReplace:
   description: Label for replace input in search box.
   message: 'Replace with: '
 labelReplaceWith:
   description: Text shown as a place holder in the replace box.
   message: Replace with...
+  touched: false
 buttonReplace:
   description: Button to replace the current match.
   message: Replace
@@ -391,3 +393,6 @@ msgInvalidScript:
 menuScriptDisabled:
   description: 'Menu item showing the status of Violentmonkey, when disabled.'
   message: Scripts disabled
+labelLineNumber:
+  description: Label for line number jumper.
+  message: 'Line no.: '

src/locale/fr-fr.yml

@@ -303,12 +303,14 @@ labelSearch:
 labelSearchFor:
   description: Text shown as a place holder in the search box.
   message: Search for...
+  touched: false
 labelReplace:
   description: Label for replace input in search box.
   message: 'Replace with: '
 labelReplaceWith:
   description: Text shown as a place holder in the replace box.
   message: Replace with...
+  touched: false
 buttonReplace:
   description: Button to replace the current match.
   message: Replace
@@ -393,3 +395,6 @@ msgInvalidScript:
 menuScriptDisabled:
   description: 'Menu item showing the status of Violentmonkey, when disabled.'
   message: ''
+labelLineNumber:
+  description: Label for line number jumper.
+  message: ''

src/locale/pl-pl.yml

@@ -305,12 +305,14 @@ labelSearch:
 labelSearchFor:
   description: Text shown as a place holder in the search box.
   message: Szukaj w...
+  touched: false
 labelReplace:
   description: Label for replace input in search box.
   message: 'Zamień na: '
 labelReplaceWith:
   description: Text shown as a place holder in the replace box.
   message: Zamień na...
+  touched: false
 buttonReplace:
   description: Button to replace the current match.
   message: Zamień
@@ -393,3 +395,6 @@ msgInvalidScript:
 menuScriptDisabled:
   description: 'Menu item showing the status of Violentmonkey, when disabled.'
   message: ''
+labelLineNumber:
+  description: Label for line number jumper.
+  message: ''

src/locale/ru-ru.yml

@@ -303,12 +303,14 @@ labelSearch:
 labelSearchFor:
   description: Text shown as a place holder in the search box.
   message: Найти для...
+  touched: false
 labelReplace:
   description: Label for replace input in search box.
   message: 'Заменить на: '
 labelReplaceWith:
   description: Text shown as a place holder in the replace box.
   message: Заменить на...
+  touched: false
 buttonReplace:
   description: Button to replace the current match.
   message: Заменить
@@ -391,3 +393,6 @@ msgInvalidScript:
 menuScriptDisabled:
   description: 'Menu item showing the status of Violentmonkey, when disabled.'
   message: ''
+labelLineNumber:
+  description: Label for line number jumper.
+  message: ''