Merge 9bbc435 into e7517cf

CometVisu · Oct 27, 2019 · 5a5b664 · 5a5b664
2 parents e7517cf + 9bbc435
commit 5a5b664
Show file tree

Hide file tree

Showing 128 changed files with 1,012 additions and 958 deletions.
diff --git a/client/source/class/cv/io/Client.js b/client/source/class/cv/io/Client.js
@@ -60,7 +60,7 @@ qx.Class.define('cv.io.Client', {
     }
 
     if (backendName && backendName !== 'default') {
-      if (qx.lang.Type.isObject(backendName)) {
+      if (typeof backendName === 'object') {
         // override default settings
         this.setBackend(backendName);
       } else if (cv.io.Client.backends[backendName]) {
@@ -248,13 +248,13 @@ qx.Class.define('cv.io.Client', {
 
     setBackend: function(newBackend) {
       // override default settings
-      var backend = qx.lang.Object.mergeWith(qx.lang.Object.clone(cv.io.Client.backends['default']), newBackend);
+      var backend = Object.assign({}, cv.io.Client.backends['default'], newBackend);
       this.backend = backend;
       if (backend.transport === 'sse' && backend.transportFallback) {
         if (window.EventSource === undefined) {
           // browser does not support EventSource object => use fallback
           // transport + settings
-          qx.lang.Object.mergeWith(backend, backend.transportFallback);
+          Object.assign(backend, backend.transportFallback);
         }
       }
       // add trailing slash to baseURL if not set
@@ -402,7 +402,7 @@ qx.Class.define('cv.io.Client', {
         if (!ev) { return null; }
         var json = ev.getTarget().getResponse();
         if (!json) { return null; }
-        if (qx.lang.Type.isString(json)) {
+        if (typeof json === 'string') {
           json = cv.io.parser.Json.parse(json);
         }
         return json;
@@ -428,7 +428,7 @@ qx.Class.define('cv.io.Client', {
         Object.getOwnPropertyNames(data).forEach(function (key) {
           if (key === "i" || key === "t") {
             prefix += key + "=" + data[key] + "&";
-          } else if (qx.lang.Type.isArray(data[key])) {
+          } else if (Array.isArray(data[key])) {
             suffix += key + "=" + data[key].join("&" + key + "=") + "&";
           } else {
             suffix += key + "=" + data[key] + "&";
@@ -496,7 +496,7 @@ qx.Class.define('cv.io.Client', {
             delete options.listeners;
           }
         }
-        ajaxRequest.set(qx.lang.Object.mergeWith({
+        ajaxRequest.set(Object.assign({
           accept: "application/json"
         }, options || {}));
         if (callback) {
@@ -553,7 +553,7 @@ qx.Class.define('cv.io.Client', {
       var json = this.getResponse(args);
       // read backend configuration if send by backend
       if (json.c) {
-        this.setBackend(qx.lang.Object.mergeWith(this.getBackend(), json.c));
+        this.setBackend(Object.assign(this.getBackend(), json.c));
       }
       this.session = json.s || "SESSION";
       this.setServer(this.getResponseHeader(args, "Server"));

diff --git a/client/source/class/cv/io/parser/Json.js b/client/source/class/cv/io/parser/Json.js
@@ -31,12 +31,12 @@ qx.Class.define('cv.io.parser.Json', {
       "qx": function(data) {
         var result = {};
         try {
-          result = qx.lang.Json.parse(data);
+          result = JSON.parse(data);
         } catch (e) {
           data.split("}{").forEach(function(subData, i) {
             try {
               var jsonString = i === 0 ? subData + "}" : "{" + subData;
-              result = qx.lang.Object.mergeWith(result, qx.lang.Json.parse(jsonString));
+              result = Object.assign(result, JSON.parse(jsonString));
             } catch (se) {
               qx.log.Logger.error(se);
             }

diff --git a/client/source/class/cv/io/transport/LongPolling.js b/client/source/class/cv/io/transport/LongPolling.js
@@ -184,7 +184,7 @@ qx.Class.define('cv.io.transport.LongPolling', {
         // addresses-startPageAddresses
         var diffAddresses = [];
         for (var i = 0; i < this.client.addresses.length; i++) {
-          if (!qx.lang.Array.contains(this.client.initialAddresses, this.client.addresses[i])) {
+          if (!this.client.initialAddresses.includes(this.client.addresses[i])) {
             diffAddresses.push(this.client.addresses[i]);
           }
         }

diff --git a/doc/manual/de/colab/dev/test.rst b/doc/manual/de/colab/dev/test.rst
@@ -86,7 +86,7 @@ Der Test für diese Datei sollte nun folgendermaßen aussehen:
         // die Hilfsfunktion gibt ein Array mit 2 Elementen zurück, das erste ist die Instanz den Widget-Objekts, das zweite der HTML-Code als String
         var res = this.createTestWidgetString("new-widget", {}, "<label>Test</label>");
         // macht aus dem String ein DOM Element
-        var widget = qx.bom.Html.clean([res[1]])[0];
+        var widget = (function(){var div=document.createElement('div');div.innerHTML=res[1];return div.childNodes[0];})();
         // das Widget Object (Instanz der Klasse cv.ui.structure.pure.NewWidget)
         var obj = res[0];
 

diff --git a/doc/manual/en/colab/dev/test.rst b/doc/manual/en/colab/dev/test.rst
@@ -95,7 +95,7 @@ The test for this file should now look like this:
         // the helper returns an array of 2 elements, the first is the widget object, the second the HTML code as a string
         var res = this.createTestWidgetString("new-widget", {}, "<label>Test</label>");
         // turns the string into a DOM element
-        var widget = qx.bom.Html.clean([res[1]])[0];
+        var widget = (function(){var div=document.createElement('div');div.innerHTML=res[1];return div.childNodes[0];})();
         // Widget Object (instance of class cv.ui.structure.pure.NewWidget)
         var obj = res[0];
 

diff --git a/skeletons/widget-test.js b/skeletons/widget-test.js
@@ -6,7 +6,7 @@ describe("testing a %WIDGET_NAME% widget", function() {
 
   it("should test the %WIDGET_NAME% creator", function() {
     var res = this.createTestWidgetString("%WIDGET_NAME%", {}, "<label>Test</label>");
-    var widget = qx.bom.Html.clean([res[1]])[0];
+    var widget = (function(){var div=document.createElement('div');div.innerHTML=res[1];return div.childNodes[0];})();
     var obj = res[0];
 
     expect(widget).toHaveClass('%WIDGET_NAME%');

diff --git a/source/class/cv/Application.js b/source/class/cv/Application.js
@@ -255,7 +255,7 @@ qx.Class.define("cv.Application",
           }
         }
       }
-      body += "```\n"+exString+"\n```\n\n**Client-Data:**\n```\n"+qx.lang.Json.stringify(bugData, null, 2)+"\n```";
+      body += "```\n"+exString+"\n```\n\n**Client-Data:**\n```\n"+JSON.stringify(bugData, null, 2)+"\n```";
 
       var notification = {
         topic: "cv.error",
@@ -275,18 +275,18 @@ qx.Class.define("cv.Application",
               action: function(ev) {
                 var parent = ev.getTarget().parentNode;
                 while (parent) {
-                  if (parent.id === "notification-center" || qx.bom.element.Class.has(parent, "popup")) {
+                  if (parent.id === "notification-center" || parent.classList.contains("popup")) {
                     break;
                   }
                   parent = parent.parentNode;
                 }
-                var box = qx.bom.Selector.query("#enableReporting", parent)[0];
+                var box = parent.querySelector("#enableReporting");
                 var url = window.location.href.split("#").shift();
                 if (box && box.checked) {
                   // reload with reporting enabled
                   url = qx.util.Uri.appendParamsToUrl(url, "reporting=true");
                 }
-                box = qx.bom.Selector.query("#reportErrors", parent)[0];
+                box = parent.querySelector("#reportErrors");
                 if (box && box.checked) {
                   // reload with automatic error reporting enabled
                   url = qx.util.Uri.appendParamsToUrl(url, "reportErrors=true");
@@ -363,7 +363,7 @@ qx.Class.define("cv.Application",
       qx.bom.Lifecycle.onReady(function () {
         // init notification router
         cv.core.notifications.Router.getInstance();
-        var body = qx.bom.Selector.query("body")[0];
+        var body = document.querySelector("body");
 
         if (cv.Config.enableCache && cv.ConfigCache.isCached()) {
           // load settings
@@ -374,7 +374,7 @@ qx.Class.define("cv.Application",
           cv.ui.ToastManager.getInstance();
         } else {
           // load empty HTML structure
-          qx.bom.element.Attribute.set(body, "html", cv.Application.HTML_STRUCT);
+          body.innerHTML = cv.Application.HTML_STRUCT;
           // initialize NotificationCenter
           cv.ui.NotificationCenter.getInstance();
           cv.ui.ToastManager.getInstance();
@@ -407,8 +407,8 @@ qx.Class.define("cv.Application",
           cv.ConfigCache.clear();
 
           // load empty HTML structure
-          var body = qx.bom.Selector.query("body")[0];
-          qx.bom.element.Attribute.set(body, "html", cv.Application.HTML_STRUCT);
+          var body = document.querySelector("body");
+          body.innerHTML = cv.Application.HTML_STRUCT;
 
           //empty model
           cv.data.Model.getInstance().resetWidgetDataModel();

diff --git a/source/class/cv/ConfigCache.js b/source/class/cv/ConfigCache.js
@@ -41,7 +41,7 @@ qx.Class.define('cv.ConfigCache', {
       if (qx.core.Environment.get("html.storage.local") === false) {
         return;
       }
-      var config = qx.lang.Object.clone(cv.Config.configSettings, true);
+      var config = JSON.parse(JSON.stringify(cv.Config.configSettings)); // deep copy
       var model = cv.data.Model.getInstance();
       this.save(this._cacheKey, {
         hash: this.toHash(xml),
@@ -51,11 +51,11 @@ qx.Class.define('cv.ConfigCache', {
         addresses: model.getAddressList(),
         configSettings: config
       });
-      localStorage.setItem(cv.Config.configSuffix+".body", qx.bom.element.Attribute.get(qx.bom.Selector.query('body')[0], 'html'));
+      localStorage.setItem(cv.Config.configSuffix+".body", document.querySelector('body').innerHTML);
     },
 
     restore: function() {
-      var body = qx.bom.Selector.query("body")[0];
+      var body = document.querySelector("body");
       var model = cv.data.Model.getInstance();
       var cache = this.getData();
       cv.Config.configSettings = cache.configSettings;
@@ -70,12 +70,12 @@ qx.Class.define('cv.ConfigCache', {
       }
       model.setWidgetDataModel(cache.data);
       model.setAddressList(cache.addresses);
-      qx.bom.element.Attribute.set(body, "html", cv.ConfigCache.getBody());
+      body.innerHTML = cv.ConfigCache.getBody();
     },
 
     save: function(key, data) {
       if (qx.core.Environment.get("html.storage.local") === true) {
-        localStorage.setItem(cv.Config.configSuffix + "." + key, qx.lang.Json.stringify(data));
+        localStorage.setItem(cv.Config.configSuffix + "." + key, JSON.stringify(data));
       }
     },
 
@@ -91,7 +91,7 @@ qx.Class.define('cv.ConfigCache', {
         return null;
       }
       if (!this._parseCacheData) {
-        this._parseCacheData = qx.lang.Json.parse(localStorage.getItem(cv.Config.configSuffix + "." + this._cacheKey));
+        this._parseCacheData = JSON.parse(localStorage.getItem(cv.Config.configSuffix + "." + this._cacheKey));
       }
       if (!this._parseCacheData) {
         return null;