### 1.2.5 (2020-03-18)

* (bluefox) Added the better error message if license could not be parsed
ioBroker · Mar 18, 2020 · 7aae6ba · 7aae6ba
1 parent 2a08ee6
commit 7aae6ba
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -193,6 +193,9 @@ Notice that this settings is valid only for reconnection and not for the first c
 ![Dark](img/dark_screen.png)
 
 ## Changelog
+### 1.2.5 (2020-03-18)
+* (bluefox) Added the better error message if license could not be parsed
+
 ### 1.2.4 (2020-02-11)
 * (bluefox) Table widget was extended with the selected object ID.
 
@@ -430,7 +433,7 @@ Notice that this settings is valid only for reconnection and not for the first c
 * (bluefox) change security settings
 
 ## License
- Copyright (c) 2013-2019 bluefox, https://github.com/GermanBluefox <[email protected]>,
+ Copyright (c) 2013-2020 bluefox, https://github.com/GermanBluefox <[email protected]>,
 
  Copyright (c) 2013-2014 hobbyquaker, https://github.com/hobbyquaker <[email protected]>,
 

diff --git a/io-package.json b/io-package.json
@@ -1,7 +1,7 @@
 {
     "common": {
         "name": "vis",
-        "version": "1.2.4",
+        "version": "1.2.5",
         "title": "Visualisation",
         "titleLang": {
             "en": "Visualisation",
@@ -16,6 +16,18 @@
             "zh-cn": "可视化"
         },
         "news": {
+            "1.2.5": {
+                "en": "Added the better error message if license could not be parsed",
+                "de": "Die bessere Fehlermeldung wurde hinzugefügt, wenn die Lizenz nicht analysiert werden konnte",
+                "ru": "Добавлено лучшее сообщение об ошибке, если лицензия не может быть проанализирована",
+                "pt": "Adicionada a melhor mensagem de erro se a licença não puder ser analisada",
+                "nl": "Het betere foutbericht toegevoegd als de licentie niet kon worden geparseerd",
+                "fr": "Ajout du meilleur message d'erreur si la licence n'a pas pu être analysée",
+                "it": "Aggiunto il messaggio di errore migliore se non è stato possibile analizzare la licenza",
+                "es": "Se agregó el mejor mensaje de error si no se pudo analizar la licencia",
+                "pl": "Dodano lepszy komunikat o błędzie, jeśli nie można przeanalizować licencji",
+                "zh-cn": "如果无法解析许可证，则添加了更好的错误消息"
+            },
             "1.2.4": {
                 "en": "Table widget was extended with the selected object ID.",
                 "de": "Das Tabellenwidget wurde um die ausgewählte Objekt-ID erweitert.",
@@ -257,4 +269,4 @@
             "native": {}
         }
     ]
-}
+}
diff --git a/main.js b/main.js
@@ -2,7 +2,7 @@
  *
  *      iobroker vis Adapter
  *
- *      Copyright (c) 2014-2019, bluefox
+ *      Copyright (c) 2014-2020, bluefox
  *      Copyright (c) 2014, hobbyquaker
  *
  *      CC-NC-BY 4.0 License
@@ -266,16 +266,6 @@ function indicateError(callback) {
 }
 
 function main() {
-    // Check if noConfig = false
-    if (adapter.common.noConfig) {
-        adapter.getForeignObject('system.adapter.' + adapter.namespace, (err, obj) => {
-            obj.common.noConfig = false;
-            adapter.setForeignObject(obj._id, obj, () => adapter.stop());
-        });
-
-        return;
-    }
-
     // first of all check license
     if (!adapter.config.license || typeof adapter.config.license !== 'string') {
         indicateError(() => {
@@ -293,7 +283,7 @@ function main() {
             } else {
                 // An object of options to indicate where to post to
                 const postOptions = {
-                    host: 'iobroker.net',
+                    host: 'iobroker1.net',
                     path: '/cert/',
                     method: 'POST',
                     headers: {
@@ -338,7 +328,7 @@ function main() {
                             }
                         } catch (e) {
                             indicateError(() => {
-                                adapter.log.error('Cannot check license! Nothing updated. Error: ' + (data ? data.result : 'unknown'));
+                                adapter.log.error('Cannot check license! Nothing updated. Error: ' + e);
                                 generatePages(true);
                             });
                         }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "iobroker.vis",
   "description": "Graphical user interface for iobroker.",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "author": {
     "name": "bluefox",
     "email": "[email protected]"
@@ -15,12 +15,6 @@
     "type": "git",
     "url": "https://github.com/iobroker/iobroker.vis"
   },
-  "licenses": [
-    {
-      "type": "CC-BY-NC-4.0",
-      "url": "https://github.com/iobroker/iobroker.vis/blob/master/LICENSE"
-    }
-  ],
   "keywords": [
     "iobroker",
     "GUI",

diff --git a/www/cache.manifest b/www/cache.manifest
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 #
-# vis Version 1.2.4
+# vis Version 1.2.5
 # dev build 0
 
 

diff --git a/www/edit.html b/www/edit.html
@@ -2,7 +2,7 @@
 <!--html manifest="cache.manifest" xmlns="http://www.w3.org/1999/html"--><html>
 <head>
 
-    <!-- vis Version 1.2.4 -->
+    <!-- vis Version 1.2.5 -->
 
     <!--
 		Use FireFox or Chrome with --allow-file-access-from-files flag to test DashUI local.

diff --git a/www/index.html b/www/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--html manifest="cache.manifest" xmlns="http://www.w3.org/1999/html"--><html>
 <head>
-    <!-- vis Version 1.2.4 -->
+    <!-- vis Version 1.2.5 -->
 
     <meta charset="utf-8">
     <meta name="apple-mobile-web-app-capable" content="yes" />

diff --git a/www/js/vis.js b/www/js/vis.js
@@ -250,7 +250,7 @@ if (typeof systemLang !== 'undefined' && typeof cordova === 'undefined') {
 }
 
 var vis = {
-    version: '1.2.4',
+    version: '1.2.5',
     requiredServerVersion: '0.0.0',
 
     storageKeyViews:    'visViews',

diff --git a/www/js/visAbout.js b/www/js/visAbout.js
@@ -2,7 +2,7 @@
  *  ioBroker.vis
  *  https://github.com/ioBroker/ioBroker.vis
  *
- *  Copyright (c) 2013-2019 bluefox https://github.com/GermanBluefox,
+ *  Copyright (c) 2013-2020 bluefox https://github.com/GermanBluefox,
  *  Copyright (c) 2013-2014 hobbyquaker https://github.com/hobbyquaker
  *  Creative Common Attribution-NonCommercial (CC BY-NC)
  *
@@ -23,7 +23,7 @@ function fillAbout() {
     html += '    </li>';
     html += '</ul>';
 
-    html += '<h4>Copyright &copy; 2013-2016 <a href="https://github.com/GermanBluefox" target="_blank">Bluefox</a>,';
+    html += '<h4>Copyright &copy; 2013-2020 <a href="https://github.com/GermanBluefox" target="_blank">Bluefox</a>,';
 	html += '   <a href="https://hobbyquaker.github.io" target="_blank">hobbyquaker</a></h4>';
 
     html += '<p>CC BY-NC License 4.0</p><a href="http://creativecommons.org/licenses/by-nc/4.0/"><img src="img/cc-nc-by.png"/></a>';

diff --git a/www/js/visEdit.js b/www/js/visEdit.js
@@ -2,7 +2,7 @@
  *  ioBroker.vis
  *  https://github.com/ioBroker/ioBroker.vis
  *
- *  Copyright (c) 2013-2019 bluefox https://github.com/GermanBluefox,
+ *  Copyright (c) 2013-2020 bluefox https://github.com/GermanBluefox,
  *  Copyright (c) 2013-2014 hobbyquaker https://github.com/hobbyquaker
  *  Creative Common Attribution-NonCommercial (CC BY-NC)
  *

diff --git a/www/js/visEditExt.js b/www/js/visEditExt.js
@@ -2,7 +2,7 @@
  *  ioBroker.vis
  *  https://github.com/ioBroker/ioBroker.vis
  *
- *  Copyright (c) 2013-2019 bluefox https://github.com/GermanBluefox,
+ *  Copyright (c) 2013-2020 bluefox https://github.com/GermanBluefox,
  *  Copyright (c) 2013-2014 hobbyquaker https://github.com/hobbyquaker
  *  Creative Common Attribution-NonCommercial (CC BY-NC)
  *
@@ -409,4 +409,4 @@ if (!$().multiselect) {
             }
         });
     })(jQuery);
-}
+}
diff --git a/www/js/visEditInspect.js b/www/js/visEditInspect.js
@@ -2,7 +2,7 @@
  *  ioBroker.vis
  *  https://github.com/ioBroker/ioBroker.vis
  *
- *  Copyright (c) 2013-2019 bluefox https://github.com/GermanBluefox,
+ *  Copyright (c) 2013-2020 bluefox https://github.com/GermanBluefox,
  *  Copyright (c) 2013-2014 hobbyquaker https://github.com/hobbyquaker
  *  Creative Common Attribution-NonCommercial (CC BY-NC)
  *
@@ -2602,4 +2602,4 @@ vis = $.extend(true, vis, {
             }
         }
     }
-});
+});
diff --git a/www/js/visEditTemplates.js b/www/js/visEditTemplates.js
@@ -2,7 +2,7 @@
  *  ioBroker.vis
  *  https://github.com/ioBroker/ioBroker.vis
  *
- *  Copyright (c) 2013-2019 bluefox https://github.com/GermanBluefox,
+ *  Copyright (c) 2013-2020 bluefox https://github.com/GermanBluefox,
  *  Copyright (c) 2013-2014 hobbyquaker https://github.com/hobbyquaker
  *  Creative Common Attribution-NonCommercial (CC BY-NC)
  *
@@ -302,4 +302,4 @@ vis.editTemplatesShowWarning = function () {
             ]
         });
     }
-};
+};
diff --git a/www/js/visEditWelcome.js b/www/js/visEditWelcome.js
@@ -2,7 +2,7 @@
  *  ioBroker.vis
  *  https://github.com/ioBroker/ioBroker.vis
  *
- *  Copyright (c) 2013-2019 bluefox https://github.com/GermanBluefox,
+ *  Copyright (c) 2013-2020 bluefox https://github.com/GermanBluefox,
  *  Copyright (c) 2013-2014 hobbyquaker https://github.com/hobbyquaker
  *  Creative Common Attribution-NonCommercial (CC BY-NC)
  *
@@ -606,4 +606,4 @@ vis.createDemoView = function () {
         "activeWidgets": []
     };
     return obj;
-};
+};
diff --git a/www/js/visUtils.js b/www/js/visUtils.js
@@ -2,7 +2,7 @@
  *  ioBroker.vis
  *  https://github.com/ioBroker/ioBroker.vis
  *
- *  Copyright (c) 2013-2019 bluefox https://github.com/GermanBluefox,
+ *  Copyright (c) 2013-2020 bluefox https://github.com/GermanBluefox,
  *  Copyright (c) 2013-2014 hobbyquaker https://github.com/hobbyquaker
  *  Creative Common Attribution-NonCommercial (CC BY-NC)
  *
@@ -550,4 +550,4 @@ function getUsedObjectIDs(views, isByViews) {
 
 if (typeof module !== 'undefined' && module.parent) {
     module.exports.getUsedObjectIDs = getUsedObjectIDs;
-}
+}
diff --git a/www/js/visWizard.js b/www/js/visWizard.js
@@ -2,7 +2,7 @@
  *  ioBroker.vis
  *  https://github.com/ioBroker/ioBroker.vis
  *
- *  Copyright (c) 2013-2019 bluefox https://github.com/GermanBluefox,
+ *  Copyright (c) 2013-2020 bluefox https://github.com/GermanBluefox,
  *  Copyright (c) 2013-2014 hobbyquaker https://github.com/hobbyquaker
  *  Creative Common Attribution-NonCommercial (CC BY-NC)
  *

diff --git a/www/js/words.js b/www/js/words.js