Merge pull request #921 from peuter/fix-reload

- parse address in reload element
CometVisu · Apr 6, 2019 · 5a2cae8 · 5a2cae8
2 parents 6be469f + acdfdfc
commit 5a2cae8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/source/class/cv/parser/widgets/Reload.js b/source/class/cv/parser/widgets/Reload.js
@@ -40,7 +40,9 @@ qx.Class.define('cv.parser.widgets.Reload', {
      * @param pageType {String} Page type (2d, 3d, ...)
      */
     parse: function (xml, path, flavour, pageType) {
-      return cv.parser.WidgetParser.parseElement(this, xml, path, flavour, pageType);
+      var data = cv.parser.WidgetParser.parseElement(this, xml, path, flavour, pageType);
+      cv.parser.WidgetParser.parseAddress(xml, path);
+      return data;
     }
   },
 

diff --git a/source/class/cv/ui/structure/pure/Reload.js b/source/class/cv/ui/structure/pure/Reload.js
@@ -46,7 +46,8 @@ qx.Class.define('cv.ui.structure.pure.Reload', {
       return;
     },
 
-    handleUpdate: function (value) {
+    _update: function (address, data) {
+      var value = this.defaultValueHandling(address, data);
       if (value > 0) {
         cv.util.Location.reload(true);
       }

diff --git a/source/test/karma/ui/structure/pure/Reload-spec.js b/source/test/karma/ui/structure/pure/Reload-spec.js
@@ -30,11 +30,11 @@ describe("testing a reload widget", function() {
   });
 
   it("should test the reload action", function() {
-    var widgetInstance = this.createTestElement("reload");
+    var widgetInstance = this.createTestElement("reload", null, null, '1/0/0');
     spyOn(cv.util.Location, "reload");
-    widgetInstance.handleUpdate(0);
+    widgetInstance._update('1/0/0', 0);
     expect(cv.util.Location.reload).not.toHaveBeenCalled();
-    widgetInstance.handleUpdate(1);
+    widgetInstance._update('1/0/0', 1);
     expect(cv.util.Location.reload).toHaveBeenCalledWith(true);
   });
 });
diff --git a/source/test/karma/ui/structure/pure/Trigger-spec.js b/source/test/karma/ui/structure/pure/Trigger-spec.js
@@ -213,7 +213,6 @@ describe("testing a trigger", function() {
         type: "pointerup"
       }));
       Reg.fireEvent(actor, "pointerup", qx.event.type.Pointer, [nativeEvent, actor, actor, true, true]);
-      qx.event.Registration.fireEvent(actor, "tap", qx.event.type.Event, []);
       expect(actor).not.toHaveClass("switchPressed");
       expect(actor).toHaveClass("switchUnpressed");