Revert "Compatible ES6. fix #3"

webofthings · Sep 18, 2016 · 1f92b68 · 1f92b68
1 parent 5192da1
commit 1f92b68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 24 deletions.
diff --git a/plugins/corePlugin.js b/plugins/corePlugin.js
@@ -62,20 +62,10 @@ CorePlugin.prototype.showValue = function () {
   console.info('Current value for %s is %s', this.model.name, util.inspect(this.model.data[this.model.data.length-1]));
 };
 
-/**
- * Fake ObjectObserve if not available
- */
-var objectObserver = Object.observe || function (resource, callback, extra) {
-	resource.push = function (data) {
-		Array.prototype.push.call(resource, data);
-		callback([{object: resource}]);
-	};
-};
-
 CorePlugin.prototype.observeActions = function () {
   var self = this;
   _.forEach(self.actions, function (actionId) { //#F
-	  objectObserver(resources.links.actions.resources[actionId].data, function (changes) {
+    Object.observe(resources.links.actions.resources[actionId].data, function (changes) {
       var action = changes[0].object[changes[0].object.length -1];
       console.info('[plugin action detected] %s', actionId);
       if (self.doAction) self.doAction(action);

diff --git a/servers/websockets.js b/servers/websockets.js
@@ -3,16 +3,6 @@ var WebSocketServer = require('ws').Server,
   resources = require('./../resources/model'),
   utils = require('./../utils/utils');
 
-/**
- * Fake Array.Observe if not available
- */
-var ArrayObserver = Array.observe || function (resource, callback, extra) {
-	resource.push = function (data) {
-		Array.prototype.push.call(resource, data);
-		callback([{object: resource}]);
-	};
-};
-
 exports.listen = function (server) {
   var wss = new WebSocketServer({server: server}); //#A
   console.info('WebSocket server started...');
@@ -22,7 +12,7 @@ exports.listen = function (server) {
       ws.send(JSON.stringify({'error': 'Invalid access token.'}));
     } else {
       try {
-    	  ArrayObserver(selectResource(reqUrl.pathname), function (changes) { //#C
+        Array.observe(selectResouce(reqUrl.pathname), function (changes) { //#C
           ws.send(JSON.stringify(changes[0].object[changes[0].object.length - 1]), function () {
           });
         }, ['add'])
@@ -33,7 +23,7 @@ exports.listen = function (server) {
   });
 };
 
-function selectResource(url) { //#E
+function selectResouce(url) { //#E
   var parts = url.split('/');
   parts.shift();
   var result;
@@ -42,7 +32,6 @@ function selectResource(url) { //#E
   } else {
     result = resources.links.properties.resources[parts[1]].data;
   }
-  console.log(result);
   return result;
 }