more refactoring

Author: odeimaiz

services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js

@@ -58,7 +58,29 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
       const win = osparc.widget.StudyDataManager.popUpInWindow(node.getStudy().serialize(), node.getNodeId(), node.getLabel());
       const closeBtn = win.getChildControl("close-button");
       osparc.utils.Utils.setIdToWidget(closeBtn, "nodeDataManagerCloseBtn");
-    }
+    },
+
+    __handleIframeStateChange: function(node, iframeLayout) {
+      iframeLayout.removeAll();
+      if (node && node.getIFrame()) {
+        const loadingPage = node.getLoadingPage();
+        const iFrame = node.getIFrame();
+        const src = iFrame.getSource();
+        const iFrameView = (src === null || src === "about:blank") ? loadingPage : iFrame;
+        iframeLayout.add(iFrameView, {
+          flex: 1
+        });
+      }
+    },
+
+    listenToIframeStateChanges: function(node, iframeLayout) {
+      if (node && node.getIFrame()) {
+        const iFrame = node.getIFrame();
+        node.getIframeHandler().addListener("iframeStateChanged", () => this.__handleIframeStateChange(node, iframeLayout), this);
+        iFrame.addListener("load", () => this.__handleIframeStateChange(node, iframeLayout));
+        this.__handleIframeStateChange(node, iframeLayout);
+      }
+    },
   },
 
   events: {
@@ -756,9 +778,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
             widget.addListener("restore", () => this.setMaximized(false), this);
           }
         });
-        node.getIframeHandler().addListener("iframeStateChanged", () => this.__iFrameStateChanged(node), this);
-        iFrame.addListener("load", () => this.__iFrameStateChanged(node), this);
-        this.__iFrameStateChanged(node);
+        osparc.desktop.WorkbenchView.listenToIframeStateChanges(node, this.__iframePage);
       } else {
         // This will keep what comes after at the bottom
         this.__iframePage.add(new qx.ui.core.Spacer(), {
@@ -767,10 +787,6 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
       }
     },
 
-    __iFrameStateChanged: function(node) {
-      osparc.node.slideshow.NodeView.handleIframeStateChange(node, this.__iframePage);
-    },
-
     __populateSecondaryColumn: function(node) {
       [
         this.__studyOptionsPage,

services/static-webserver/client/source/class/osparc/node/slideshow/NodeView.js

@@ -40,21 +40,6 @@ qx.Class.define("osparc.node.slideshow.NodeView", {
     LOGGER_HEIGHT: 28,
   },
 
-  statics: {
-    handleIframeStateChange: function(node, iframeLayout) {
-      iframeLayout.removeAll();
-      if (node && node.getIFrame()) {
-        const loadingPage = node.getLoadingPage();
-        const iFrame = node.getIFrame();
-        const src = iFrame.getSource();
-        const iFrameView = (src === null || src === "about:blank") ? loadingPage : iFrame;
-        iframeLayout.add(iFrameView, {
-          flex: 1
-        });
-      }
-    },
-  },
-
   members: {
     __loggerPanel: null,
 
@@ -91,10 +76,7 @@ qx.Class.define("osparc.node.slideshow.NodeView", {
       const loadingPage = this.getNode().getLoadingPage();
       const iFrame = this.getNode().getIFrame();
       if (loadingPage && iFrame) {
-        const node = this.getNode();
-        node.getIframeHandler().addListener("iframeStateChanged", () => this.__iFrameStateChanged(), this);
-        iFrame.addListener("load", () => this.__iFrameStateChanged());
-        this.__iFrameStateChanged();
+        osparc.desktop.WorkbenchView.listenToIframeStateChanges(this.getNode(), this._iFrameLayout);
       } else {
         // This will keep what comes after at the bottom
         this._iFrameLayout.add(new qx.ui.core.Spacer(), {
@@ -147,9 +129,5 @@ qx.Class.define("osparc.node.slideshow.NodeView", {
     _applyNode: function(node) {
       this.base(arguments, node);
     },
-
-    __iFrameStateChanged: function() {
-      osparc.node.slideshow.NodeView.handleIframeStateChange(this.getNode(), this._iFrameLayout);
-    }
   }
 });

services/static-webserver/client/source/class/osparc/viewer/NodeViewer.js

@@ -78,20 +78,13 @@ qx.Class.define("osparc.viewer.NodeViewer", {
       const iframeHandler = node.getIframeHandler();
       if (iframeHandler) {
         iframeHandler.checkState();
-        iframeHandler.addListener("iframeStateChanged", () => this.__iFrameStateChanged(), this);
-        iframeHandler.getIFrame().addListener("load", () => this.__iFrameStateChanged(), this);
-        this.__iFrameStateChanged();
-
+        osparc.desktop.WorkbenchView.listenToIframeStateChanges(node, this);
         this.__attachSocketEventHandlers();
       } else {
         console.error(node.getLabel() + " iframe handler not ready");
       }
     },
 
-    __iFrameStateChanged: function() {
-      osparc.node.slideshow.NodeView.handleIframeStateChange(this.getNode(), this);
-    },
-
     __attachSocketEventHandlers: function() {
       this.__listenToNodeUpdated();
       this.__listenToNodeProgress();