Removed duplicated file and move files to folder for better overview.

Author: MarkusBordihn

src/protocol/low-level/bluetooth/low_energy/device.js

@@ -110,8 +110,8 @@ cwc.protocol.bluetooth.lowEnergy.Device.prototype.listen = function(
   this.characteristic_[characteristicId]['startNotifications']().then(() => {
     this.log.info('Adding event listener for', characteristicId);
     this.characteristic_[characteristicId]['addEventListener'](
-      'characteristicvaluechanged', function(e) {
-        func(e.target.value.buffer);
+      'characteristicvaluechanged', (e) => {
+        this.handleData_(e.target.value.buffer, func);
       });
   });
 };
@@ -225,6 +225,15 @@ cwc.protocol.bluetooth.lowEnergy.Device.prototype.connectCharacteristic_ =
 };
 
 
-cwc.protocol.bluetooth.lowEnergy.Device.prototype.handleData_ = function(e) {
-  console.log('Data', e.target, e.target.value);
+/**
+ * @param {?} data
+ * @param {?} callback
+ */
+cwc.protocol.bluetooth.lowEnergy.Device.prototype.handleData_ = function(data,
+    callback) {
+  if (!data) {
+    return;
+  }
+  console.log('Data', data);
+  callback(data);
 };

src/runner/runnerConnector.js

@@ -58,12 +58,6 @@ cwc.runner.Connector = function(helper, name = 'Runner Connector') {
   /** @type {!boolean} */
   this.listen = false;
 
-  /** @private {!cwc.utils.Events} */
-  this.events_ = new cwc.utils.Events(this.name);
-
-  /** @type {!boolean} */
-  this.directUpdate = false;
-
   /** @type {!string} */
   this.token = String(new Date().getTime());
 
@@ -76,21 +70,24 @@ cwc.runner.Connector = function(helper, name = 'Runner Connector') {
   /** @type {!number} */
   this.pingTestWorker = 0;
 
+  /** @private {!cwc.utils.Events} */
+  this.events_ = new cwc.utils.Events(this.name);
+
   /** @private {!cwc.utils.Logger} */
   this.log_ = new cwc.utils.Logger(this.name);
 };
 
 
 /**
  * Inits the runner instance.
- * @param {boolean=} opt_listen
+ * @param {boolean=} listen
  */
-cwc.runner.Connector.prototype.init = function(opt_listen) {
-  if (opt_listen) {
+cwc.runner.Connector.prototype.init = function(listen) {
+  if (listen) {
     this.events_.listen(window, 'message', this.handleMessage_, false, this);
     this.listen = true;
   }
-  this.addCommand('__direct_update__', this.enableDirectUpdate_, this);
+  this.addCommand('__gamepad__', this.handleGamepad_, this);
   this.addCommand('__handshake__', this.handleHandshake_, this);
   this.addCommand('__pong__', this.handlePong_, this);
 };
@@ -113,15 +110,15 @@ cwc.runner.Connector.prototype.setTarget = function(target) {
 
 /**
  * @param {string!} command
- * @param {Object|number|string|Array=} optValue
+ * @param {Object|number|string|Array=} value
  */
-cwc.runner.Connector.prototype.send = function(command, optValue) {
+cwc.runner.Connector.prototype.send = function(command, value) {
   if (!this.target || !this.target.contentWindow || !this.targetLoaded) {
     return;
   }
 
   this.target.contentWindow.postMessage({
-    'command': command, 'value': optValue},
+    'command': command, 'value': value},
     this.targetOrigin);
 };
 
@@ -138,15 +135,6 @@ cwc.runner.Connector.prototype.start = function() {
 };
 
 
-/**
- * @private
- */
-cwc.runner.Connector.prototype.enableDirectUpdate_ = function() {
-  this.log_.info('Enabled direct update ...');
-  this.directUpdate = true;
-};
-
-
 /**
  * @param {!string} name
  * @param {!function(?)} func
@@ -198,27 +186,27 @@ cwc.runner.Connector.prototype.addCommandProfile = function(profile, scope) {
 
 /**
  * @param {!function(?)} func
- * @param {?=} opt_scope
+ * @param {?=} scope
  * @export
  */
-cwc.runner.Connector.prototype.setStartEvent = function(func, opt_scope) {
-  this.addCommand('__start__', func, opt_scope);
+cwc.runner.Connector.prototype.setStartEvent = function(func, scope) {
+  this.addCommand('__start__', func, scope);
 };
 
 
 /**
  * @param {!string} name
  * @param {!function(?)} func
- * @param {?=} opt_scope
+ * @param {?=} scope
  * @export
  */
-cwc.runner.Connector.prototype.addMonitor = function(name, func, opt_scope) {
+cwc.runner.Connector.prototype.addMonitor = function(name, func, scope) {
   if (!func) {
     this.log_.error('Runner monitor function is undefined for', name);
     return;
   }
-  if (opt_scope) {
-    this.monitor[name] = func.bind(opt_scope);
+  if (scope) {
+    this.monitor[name] = func.bind(scope);
   } else {
     this.monitor[name] = func;
   }
@@ -311,11 +299,11 @@ cwc.runner.Connector.prototype.ping = function() {
 
 
 /**
- * @param {boolean=} opt_disable
+ * @param {boolean=} disable
  * @export
  */
-cwc.runner.Connector.prototype.pingTest = function(opt_disable) {
-  if (opt_disable && this.pingTestWorker) {
+cwc.runner.Connector.prototype.pingTest = function(disable) {
+  if (disable && this.pingTestWorker) {
     clearInterval(this.pingTestWorker);
   } else if (!this.pingTestWorker) {
     this.pingTestWorker = setInterval(this.ping.bind(this), 0);
@@ -324,10 +312,9 @@ cwc.runner.Connector.prototype.pingTest = function(opt_disable) {
 
 
 /**
- * @param {goog.events.BrowserEvent=} opt_event
  * @private
  */
-cwc.runner.Connector.prototype.handleContentLoad_ = function(opt_event) {
+cwc.runner.Connector.prototype.handleContentLoad_ = function() {
   this.targetLoaded = true;
 };
 
@@ -348,6 +335,14 @@ cwc.runner.Connector.prototype.handleMessage_ = function(event) {
 };
 
 
+/**
+ * @private
+ */
+cwc.runner.Connector.prototype.handleGamepad_ = function() {
+  console.log('Enable Gamepad Support');
+};
+
+
 /**
  * @param {!string} token
  * @private

src/ui/runner/runner_monitor.gss renamed to src/ui/runner/monitor/runner_monitor.gss

@@ -61,27 +61,18 @@ cwc.ui.Runner = function(helper) {
   /** @type {Element} */
   this.nodeRuntime = null;
 
-  /** @type {Element} */
-  this.nodeToolbar = null;
-
   /** @type {Element} */
   this.nodeTerminal = null;
 
   /** @type {Element} */
   this.nodeInfo = null;
 
-  /** @type {Element} */
-  this.nodeStatusbar = null;
-
   /** @type {Element} */
   this.nodeOverlay = null;
 
   /** @type {Element} */
   this.nodeTurtle = null;
 
-  /** @type {Element} */
-  this.nodeInfobar = null;
-
   /** @type {Element} */
   this.nodeMonitor = null;
 
@@ -130,9 +121,6 @@ cwc.ui.Runner = function(helper) {
   /** @type {number} */
   this.stopTime = 0;
 
-  /** @type {string} */
-  this.targetOrigin = '*';
-
   /** @type {?function()} */
   this.externalCleanUp = null;
 
@@ -166,23 +154,25 @@ cwc.ui.Runner.prototype.decorate = function(node) {
   this.nodeTurtle = goog.dom.getElement(this.prefix + 'turtle');
 
   // Toolbar
-  this.nodeToolbar = goog.dom.getElement(this.prefix + 'toolbar-chrome');
-  if (this.nodeToolbar) {
+  let nodeToolbar = goog.dom.getElement(this.prefix + 'toolbar-chrome');
+  if (nodeToolbar) {
     this.toolbar = new cwc.ui.RunnerToolbar(this.helper);
-    this.toolbar.decorate(this.nodeToolbar);
+    this.toolbar.decorate(nodeToolbar);
   }
 
   // Statusbar
-  this.nodeStatusbar = goog.dom.getElement(this.prefix + 'statusbar');
-  if (this.nodeStatusbar) {
+  let nodeStatusbar = goog.dom.getElement(this.prefix + 'statusbar');
+  if (nodeStatusbar) {
     this.statusbar = new cwc.ui.Statusbar(this.helper);
-    this.statusbar.decorate(this.nodeStatusbar);
+    this.statusbar.decorate(nodeStatusbar);
   }
 
   // Infobar
-  this.nodeInfobar = goog.dom.getElement(this.prefix + 'infobar');
-  this.infobar = new cwc.ui.RunnerInfobar(this.helper);
-  this.infobar.decorate(this.nodeInfobar);
+  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');