Removed info overlay from runner instance.

Author: MarkusBordihn

package-lock.json

@@ -11,7 +11,7 @@
     "jsdoc": "^3.5.5",
     "npm": "^5.8.0",
     "npm-check-updates": "^2.14.1",
-    "nw": "^0.29.4",
+    "nw": "^0.30.0",
     "nw-builder": "^3.5.1",
     "rimraf": "^2.6.2"
   },

package.json

@@ -143,8 +143,7 @@ cwc.mode.lego.ev3.Runner.prototype.decorate = function() {
       'updateUltrasonicSensor');
 
   // Info template
-  this.runner.showInfoButton(true);
-  this.runner.setInfoTemplate(cwc.soy.mode.ev3.Runner.info);
+  // this.runner.setInfoTemplate(cwc.soy.mode.ev3.Runner.info);
   this.runner.setCleanUpFunction(this.api.cleanUp, this.api);
   this.runner.decorate(this.node);
 

src/mode/lego/ev3/runner.js

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+
 #{$prefix}runner-body,
 #{$prefix}runner-chrome,
 #{$prefix}runner-content {
@@ -101,14 +102,6 @@
   background: #fff;
 }
 
-#{$prefix}runner-info {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  z-index: 10;
-  background: #fff;
-}
-
 #{$prefix}runner-terminal {
   position: absolute;
   height: 200px;

src/ui/runner/runner.gss

@@ -64,9 +64,6 @@ cwc.ui.Runner = function(helper) {
   /** @type {Element} */
   this.nodeTerminal = null;
 
-  /** @type {Element} */
-  this.nodeInfo = null;
-
   /** @type {Element} */
   this.nodeOverlay = null;
 
@@ -79,9 +76,6 @@ cwc.ui.Runner = function(helper) {
   /** @type {Webview} */
   this.content = null;
 
-  /** @type {function(Object, null=, Object<string, *>=):*} */
-  this.infoTemplate = function() {};
-
   /** @type {function(Object, null=, Object<string, *>=):*} */
   this.overlayTemplate = function() {};
 
@@ -126,6 +120,9 @@ cwc.ui.Runner = function(helper) {
 
   /** @private {!cwc.utils.Events} */
   this.events_ = new cwc.utils.Events(this.name);
+
+  /** @private {!cwc.utils.Logger} */
+  this.log_ = new cwc.utils.Logger(this.name);
 };
 
 
@@ -136,7 +133,7 @@ cwc.ui.Runner = function(helper) {
 cwc.ui.Runner.prototype.decorate = function(node) {
   this.node = node || goog.dom.getElement(this.prefix + 'chrome');
   if (!this.node) {
-    console.error('Invalid Runner node:', this.node);
+    this.log_.error('Invalid Runner node:', this.node);
     return;
   }
 
@@ -145,8 +142,6 @@ cwc.ui.Runner.prototype.decorate = function(node) {
     toolbarPrefix: this.helper.getPrefix('runner-toolbar'),
   });
 
-  this.nodeInfo = goog.dom.getElement(this.prefix + 'info');
-
   // Runtime
   this.nodeRuntime = goog.dom.getElement(this.prefix + 'runtime');
 
@@ -167,13 +162,6 @@ cwc.ui.Runner.prototype.decorate = function(node) {
     this.statusbar.decorate(nodeStatusbar);
   }
 
-  // Infobar
-  let nodeInfobar = goog.dom.getElement(this.prefix + 'infobar');
-  if (nodeInfobar) {
-    this.infobar = new cwc.ui.RunnerInfobar(this.helper);
-    this.infobar.decorate(nodeInfobar);
-  }
-
   // Monitor
   this.nodeMonitor = goog.dom.getElement(this.prefix + 'monitor');
   this.monitor = new cwc.ui.RunnerMonitor(this.helper);
@@ -193,14 +181,6 @@ cwc.ui.Runner.prototype.decorate = function(node) {
   this.showOverlay(this.overlayTemplate ? true : false);
   this.renderOverlayTemplate(this.overlayTemplate);
 
-  // Info overlay
-  let hasInfoTemplate = goog.isDefAndNotNull(this.infoTemplate);
-  if (this.toolbar) {
-    this.toolbar.enableInfoButton(hasInfoTemplate);
-  }
-  this.showInfo(hasInfoTemplate);
-  this.renderInfoTemplate(this.infoTemplate);
-
   // Runner
   this.connector.init(true);
   let layoutInstance = this.helper.getInstance('layout');
@@ -213,15 +193,6 @@ cwc.ui.Runner.prototype.decorate = function(node) {
 };
 
 
-/**
- * Sets the info template.
- * @param {!function(Object, null=, Object<string, *>=):*} template
- */
-cwc.ui.Runner.prototype.setInfoTemplate = function(template) {
-  this.infoTemplate = template;
-};
-
-
 /**
  * Sets the terminate template.
  * @param {!function(Object, null=, Object<string, *>=):*} template
@@ -232,18 +203,7 @@ cwc.ui.Runner.prototype.setOverlayTemplate = function(template, prefix = '') {
     this.overlayTemplate = template;
     this.overlayTemplatePrefix = prefix;
   } else {
-    console.error('None overlay template!');
-  }
-};
-
-
-/**
- * Render the info template.
- * @param {function(Object, null=, Object<string, *>=):*} template
- */
-cwc.ui.Runner.prototype.renderInfoTemplate = function(template) {
-  if (this.nodeInfo && template) {
-    goog.soy.renderElement(this.nodeInfo, template);
+    this.log_.error('None overlay template!');
   }
 };
 
@@ -276,37 +236,6 @@ cwc.ui.Runner.prototype.setCleanUpFunction = function(func, scope) {
 };
 
 
-/**
- * @param {boolean} visible
- */
-cwc.ui.Runner.prototype.showInfoButton = function(visible) {
-  if (this.toolbar) {
-    this.toolbar.showInfoButton(visible);
-  }
-};
-
-
-/**
- * Toggles the info window.
- */
-cwc.ui.Runner.prototype.toggleInfo = function() {
-  if (this.nodeInfo) {
-    this.showInfo(!goog.style.isElementShown(this.nodeInfo));
-  }
-};
-
-
-/**
- * Shows / hides info window.
- * @param {boolean} visible
- */
-cwc.ui.Runner.prototype.showInfo = function(visible) {
-  if (this.nodeInfo) {
-    goog.style.setElementShown(this.nodeInfo, visible);
-  }
-};
-
-
 /**
  * Shows / hides overlay window.
  * @param {boolean} visible
@@ -410,15 +339,14 @@ cwc.ui.Runner.prototype.run = function() {
   let rendererInstance = this.helper.getInstance('renderer', true);
   let contentUrl = rendererInstance.getContentUrl();
   if (!contentUrl) {
-    console.error('Was not able to get content url!');
+    this.log_.error('Was not able to get content url!');
     return;
   }
 
   if (this.infobar) {
     this.infobar.clear();
   }
 
-  this.showInfo(false);
   if (this.content) {
     if (this.status == cwc.ui.StatusbarState.LOADING ||
         this.status == cwc.ui.StatusbarState.UNRESPONSIVE) {
@@ -506,7 +434,7 @@ cwc.ui.Runner.prototype.terminate = function() {
  */
 cwc.ui.Runner.prototype.remove = function() {
   if (this.content) {
-    console.info('Remove Runner...');
+    this.log_.info('Remove Runner...');
     this.terminate();
     this.nodeRuntime.removeChild(this.content);
     this.content = null;

src/ui/runner/runner.js

@@ -28,7 +28,6 @@
   <div id="{$prefix}body">
     {call .toolbar_ data="all" /}
     <div id="{$prefix}content">
-      <div id="{$prefix}info"></div>
       <div id="{$prefix}status"></div>
       <div id="{$prefix}statusbar"></div>
       <div id="{$prefix}overlay"></div>
@@ -97,13 +96,6 @@
           {param opt_title: 'Collapse Blockly editor.' /}
         {/call}
 
-        {call cwc.soy.ui.Template.navigationIcon}
-          {param prefix: $toolbarPrefix /}
-          {param id: 'info' /}
-          {param icon: 'info_outline' /}
-          {param opt_title: 'Shows general information...' /}
-        {/call}
-
       </nav>
     </div>
   </header>