better parameters possibility on config-menu.js

viliusle · Jun 19, 2021 · 0fa15bd · 0fa15bd
1 parent 16f19ba
commit 0fa15bd
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 40 deletions.
diff --git a/src/js/config-menu.js b/src/js/config-menu.js
@@ -640,70 +640,85 @@ const menuDefinition = [
  children: [
  {
  name: 'English',
- target: 'tools/translate.translate.en'
+ target: 'tools/translate.translate',
+ parameter: 'en',
  },
  {
  divider: true
  },
  {
  //Arabic
  name: 'عربي',
- target: 'tools/translate.translate.ar'
+ target: 'tools/translate.translate',
+ parameter: 'ar',
  },
  {
  //Chinese simplified
  name: '简体中文',
- target: 'tools/translate.translate.zh'
+ target: 'tools/translate.translate',
+ parameter: 'zh',
  },
  {
  name: 'Deutsch',
- target: 'tools/translate.translate.de'
+ target: 'tools/translate.translate',
+ parameter: 'de',
  },
  {
  name: 'English (UK)',
- target: 'tools/translate.translate.uk'
+ target: 'tools/translate.translate',
+ parameter: 'uk',
  },
  {
  name: 'Español',
- target: 'tools/translate.translate.es'
+ target: 'tools/translate.translate',
+ parameter: 'es',
  },
  {
  name: 'Français',
- target: 'tools/translate.translate.fr'
+ target: 'tools/translate.translate',
+ parameter: 'fr',
  },
  {
  name: 'Greek',
- target: 'tools/translate.translate.el'
+ target: 'tools/translate.translate',
+ parameter: 'el',
  },
  {
  name: 'Italiano',
- target: 'tools/translate.translate.it'
+ target: 'tools/translate.translate',
+ parameter: 'it',
  },
  {
  //Japanese
  name: '日本語',
- target: 'tools/translate.translate.ja'
+ target: 'tools/translate.translate',
+ parameter: 'ja',
  },
  {
  //Korean
  name: '한국어',
- target: 'tools/translate.translate.ko'
+ target: 'tools/translate.translate',
+ parameter: 'ko',
  },
  {
  name: 'Lietuvių',
- target: 'tools/translate.translate.lt'
+ target: 'tools/translate.translate',
+ parameter: 'lt',
  },
  {
  name: 'Português',
- target: 'tools/translate.translate.pt'
+ target: 'tools/translate.translate',
+ parameter: 'pt',
  },
  {
  name: 'русский язык',
- target: 'tools/translate.translate.ru'
+ target: 'tools/translate.translate',
+ parameter: 'ru',
  },
  {
  name: 'Türkçe',
- target: 'tools/translate.translate.tr'
+ target: 'tools/translate.translate',
+ parameter: 'tr',
  }
  ]
  },

diff --git a/src/js/core/base-gui.js b/src/js/core/base-gui.js
@@ -165,11 +165,11 @@ class Base_gui_class {
  var _this = this;
 
  //menu events
- this.GUI_menu.on('select_target', (target) => {
+ this.GUI_menu.on('select_target', (target, object) => {
  var parts = target.split('.');
  var module = parts[0];
  var function_name = parts[1];
- var param = parts[2];
+ var param = object.parameter ??= null;
 
  //call module
  if (this.modules[module] == undefined) {

diff --git a/src/js/core/gui/gui-menu.js b/src/js/core/gui/gui-menu.js
@@ -59,10 +59,10 @@ class GUI_menu_class {
  }
  }
 
- emit(eventName, payload) {
+ emit(eventName, payload, object) {
  if (this.eventSubscriptions[eventName]) {
  for (let callback of this.eventSubscriptions[eventName]) {
- callback(payload);
+ callback(payload, object);
  }
  }
  }
@@ -297,10 +297,10 @@ class GUI_menu_class {
 
  // Emit callback events for triggered links
  if (definition.target) {
- this.emit('select_target', definition.target);
+ this.emit('select_target', definition.target, definition);
  }
  else if (definition.href) {
- this.emit('select_href', definition.href);
+ this.emit('select_href', definition.href, null);
  }
  }
 

diff --git a/src/js/modules/file/open.js b/src/js/modules/file/open.js
@@ -419,26 +419,36 @@ class File_open_class {
  maybe_file_open_url_handler() {
  var _this = this;
  var url_params = this.Helper.get_url_parameters();
- 
+
  if (url_params.image != undefined) {
- //found params - try to load it
- if(url_params.image.toLowerCase().indexOf('.json') == url_params.image.length - 5){
- //load json
- window.fetch(url_params.image).then(function(response) {
- return response.json();
- }).then(function(json) {
- _this.load_json(json, false);
- }).catch(function(ex) {
- alertify.error('Sorry, image could not be loaded.');
- });
- }
- else{
- //load image
- var data = {
- url: url_params.image,
- };
- this.file_open_url_handler(data);
- }
+ this.open_resource(url_params.image);
+ }
+ }
+
+ /**
+ * includes provided resource (iamge or json)
+ *
+ * @param string resource_url
+ */
+ open_resource(resource_url) {
+ var _this = this;
+
+ if(resource_url.toLowerCase().indexOf('.json') == resource_url.length - 5){
+ //load json
+ window.fetch(resource_url).then(function(response) {
+ return response.json();
+ }).then(function(json) {
+ _this.load_json(json, false);
+ }).catch(function(ex) {
+ alertify.error('Sorry, image could not be loaded.');
+ });
+ }
+ else{
+ //load image
+ var data = {
+ url: resource_url,
+ };
+ this.file_open_url_handler(data);
  }
  }