Merge branch 'dev'

Author: gera2ld

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*]
+end_of_line = lf
+indent_style = space
+indent_size = 2

.gitignore

@@ -3,3 +3,4 @@ node_modules/
 *.bat
 *.mxaddon
 *.log
+*.lock

gulpfile.js

@@ -18,7 +18,7 @@ const isProd = process.env.NODE_ENV === 'production';
 
 const paths = {
   cache: 'src/cache.js',
-  def: 'src/def.json',
+  def: 'src/def.yml',
   templates: [
     'src/**/*.html',
     '!src/**/index.html',
@@ -51,7 +51,7 @@ gulp.task('watch', ['build'], () => {
   gulp.watch(paths.jsCollect, ['js']);
   gulp.watch(paths.copy, ['copy-files']);
   gulp.watch(paths.locales, ['copy-i18n']);
-  gulp.watch(paths.def, ['copy-def']);
+  gulp.watch(paths.def, ['manifest']);
 });
 
 gulp.task('lint', () => (

scripts/json.js

@@ -1,12 +1,20 @@
 const gutil = require('gulp-util');
 const through = require('through2');
+const yaml = require('js-yaml');
 
 module.exports = function (handle) {
   return through.obj(function (file, enc, cb) {
     if (file.isNull()) return cb();
     if (file.isStream()) return this.emit('error', new gutil.PluginError('VM-json', 'Stream is not supported.'));
     handle = handle || (i => i);
-    file.contents = new Buffer(JSON.stringify(handle(JSON.parse(String(file.contents)))));
+    let contents = String(file.contents);
+    if (file.relative.toLowerCase().endsWith('.yml')) {
+      contents = yaml.safeLoad(contents);
+      file.path = file.path.slice(0, -4) + '.json';
+    } else {
+      contents = JSON.parse(contents);
+    }
+    file.contents = new Buffer(JSON.stringify(handle(contents)));
     cb(null, file);
   });
 };

src/background/app.js

@@ -311,6 +311,6 @@ vmdb.initialized.then(function () {
   sync.init();
 });
 
-_.mx.rt.icon.setIconImage('icon' + (_.options.get('isApplied') ? '' : 'w'));
+_.setIcon('icon' + (_.options.get('isApplied') ? '' : 'w'));
 
 tabsUtils.on('TAB_SWITCH', badges.get);

src/common.js

@@ -38,6 +38,18 @@ _.mx = {
 };
 _.mx.br = _.mx.rt.create('mx.browser');
 
+_.setIcon = function (icon) {
+  // Initialize on first call
+  function setIcon(icon) {
+    _.mx.rt.icon.setIconImage(icon);
+    tIcon && tIcon.setIconImage(icon);
+  }
+  var ui = _.mx.rt.create('mx.app.ui');
+  var tIcon = ui && ui.getEntryPointByActionName && ui.getEntryPointByActionName('icon', 'toolbar');
+  _.setIcon = setIcon;
+  setIcon(icon);
+};
+
 _.i18n = function (key) {
   if (!key) return '';
   var data = _.mx.rt.locale.t(key);

src/def.json

@@ -0,0 +1,33 @@
+- type: extension
+  frameworkVersion: 1.0.6
+  version: __VERSION__
+  guid: '{7732dc50-47c1-9be5-6ea9-f85c38172974}'
+  author:
+    name: Gerald
+    email: [email protected]
+  name: Violentmonkey
+  title:
+    _t: extName
+  description:
+    _t: extDescription
+  permissions:
+    httpRequest:
+      - '*'
+    notifications: true
+  config: options/index.html
+  service:
+    main: background/index.html
+  actions:
+    - type: script
+      entryPoints:
+        - doc_start
+      js:
+        - injected.js
+      includeFrames: true
+    - name: icon
+      type: panel
+      icon: iconw
+      entryPoints:
+        - sidebar
+        - toolbar
+      main: popup/index.html

src/def.yml

@@ -6,14 +6,14 @@ extDescription:
   message: Podpora uživatelských skriptů pro Maxthon.
 extTranslator:
   description: Information of the translator.
-  message: 'R3gi <[email protected]>'
+  message: R3gi <[email protected]>
   touched: false
 msgUpdated:
   description: Message shown when a script is updated/reinstalled.
   message: Skript aktualizován.
 msgErrorFetchingScript:
   description: Message shown when Violentmonkey fails fetching a new version of the script.
-  message: 'Chyba načítání skriptů!'
+  message: Chyba načítání skriptů!
 msgInstalled:
   description: Message shown when a script is installed.
   message: Skript nainstalován.
@@ -22,15 +22,19 @@ Warning:
   message: Varování
 msgWarnGrant:
   description: Message shown when `@grant` is not found in a script.
-  message: 'Skript [$1] nemá žádné „@grant“ řádky, což není doporučeno a může způsobovat problémy. Pro více informací klepněte sem.'
+  message: >-
+    Skript [$1] nemá žádné „@grant“ řádky, což není doporučeno a může způsobovat
+    problémy. Pro více informací klepněte sem.
 labelNoName:
   description: Text as the name of a script when no @name is assigned.
   message: Bez názvu
 msgUpdating:
   description: Message shown when a new version of script is being fetched.
   message: Aktualizování…
 msgNewVersion:
-  description: 'Message shown when a new version of script is found by @updateURL, but no @downloadURL is provided.'
+  description: >-
+    Message shown when a new version of script is found by @updateURL, but no
+    @downloadURL is provided.
   message: Nalezena nová verze.
 msgCheckingForUpdate:
   description: Message shown when a script is being checked for updates by version numbers.
@@ -60,10 +64,14 @@ buttonClose:
   description: Button to close window.
   message: Zavřít
 msgErrorLoadingData:
-  description: Message shown on confirm page when the script to be installed cannot be loaded.
+  description: >-
+    Message shown on confirm page when the script to be installed cannot be
+    loaded.
   message: Chyba načítání skriptu.
 msgLoadedData:
-  description: Message shown in the confirm page when a javascript file to be installed is loaded.
+  description: >-
+    Message shown in the confirm page when a javascript file to be installed is
+    loaded.
   message: Skript načten.
 msgErrorLoadingDependency:
   description: Message shown when not all requirements are loaded successfully.
@@ -146,7 +154,9 @@ labelRelated:
   message: 'Související odkazy: '
 anchorSupportPage:
   description: Link to the support page of Violentmonkey.
-  message: '<a href=https://github.com/gera2ld/Violentmonkey-mx/wiki target=_blank>Violentmonkey</a>'
+  message: >-
+    <a href=https://github.com/gera2ld/Violentmonkey-mx/wiki
+    target=_blank>Violentmonkey</a>
 labelDonate:
   description: Label of link to donate page.
   message: Podpořte vývoj
@@ -251,7 +261,9 @@ buttonUpdate:
   description: Check a script for updates.
   message: Zkontrolovat aktualizace
 msgImported:
-  description: Message shown after import. There is an argument referring to the count of scripts imported.
+  description: >-
+    Message shown after import. There is an argument referring to the count of
+    scripts imported.
   message: 'Počet importovaných položek: $1'
 hintUseDownloadURL:
   description: Shown as a place holder for @updateURL when it is not assigned
@@ -269,7 +281,9 @@ buttonVacuumed:
   message: Data vyluxována
 hintVacuum:
   description: Hint for vacuuming data.
-  message: Zlikvidování redudance a pokus o znovu načtení chybějících zdrojů z mezipaměti.
+  message: >-
+    Zlikvidování redudance a pokus o znovu načtení chybějících zdrojů z
+    mezipaměti.
 menuManageScripts:
   description: 'Menu item to manage scripts, or to open the options page of the extension.'
   message: Správa skriptů
@@ -312,26 +326,33 @@ labelAutoReloadCurrentTab:
 labelInjectMode:
   description: Label for a combo box to choose script injection modes.
   message: ''
+  touched: false
 injectModeNormal:
   description: 'Script injection mode: Normal'
   message: ''
+  touched: false
 injectModeAdvanced:
   description: 'Script injection mode: Advanced'
   message: ''
+  touched: false
 hintInjectModeNormal:
   description: Hint to explain the normal injection mode.
   message: ''
+  touched: false
 hintInjectModeAdvanced:
   description: Hint to explain the advanced injection mode.
   message: ''
+  touched: false
 hintInputURL:
   description: Hint for a prompt box to input URL of a user script.
   message: ''
 buttonInstallFromURL:
   description: Button to ask for URL of a user script.
   message: ''
 msgNamespaceConflict:
-  description: Message shown when namespace of the new script conflicts with an existent one.
+  description: >-
+    Message shown when namespace of the new script conflicts with an existent
+    one.
   message: ''
 labelSyncTo:
   description: Label for sync service.
@@ -366,3 +387,9 @@ lastSync:
 labelSync:
   description: Label for sync options.
   message: ''
+msgInvalidScript:
+  description: Message shown when script is invalid.
+  message: ''
+menuScriptDisabled:
+  description: 'Menu item showing the status of Violentmonkey, when disabled.'
+  message: ''