From 93a2e9063fc71a1575abf593960257232084158a Mon Sep 17 00:00:00 2001 From: Martin Donnelly Date: Fri, 26 Aug 2016 11:57:06 +0100 Subject: [PATCH] Regresed ES6 stuff because it doesn't work in safari --- app/js/mdot.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/js/mdot.js b/app/js/mdot.js index c49d1bd..e6d9c54 100644 --- a/app/js/mdot.js +++ b/app/js/mdot.js @@ -46,10 +46,10 @@ /* Get a branch from the date tree and see if the reduced set of records has a matching timestamp.. */ - let count = 0; - const tsDate = new Date(ts); - const tsMS = tsDate.getTime(); - const branch = this.dateTree[tsDate.getFullYear().toString()][tsDate.getMonth().toString()][tsDate.getDate().toString()]; + var count = 0; + var tsDate = new Date(ts); + var tsMS = tsDate.getTime(); + var branch = this.dateTree[tsDate.getFullYear().toString()][tsDate.getMonth().toString()][tsDate.getDate().toString()]; if (typeof branch === 'undefined') { return count; @@ -69,9 +69,9 @@ */ var _tree = {}; _(occupancy).each(function(item) { - const newItem = item; - let day, month,year; - const _date = new Date(item.start); + var newItem = item; + var day, month,year; + var _date = new Date(item.start); newItem.startMS = new Date(item.start).getTime(); newItem.endMS = new Date(item.end).getTime(); @@ -125,7 +125,7 @@ } _(events.data).each(function(i) { - let _occupancy = 0; + var _occupancy = 0; if (!skipOccupancy) { _occupancy = this.findOccupancy(i.timestamp, events.occupancy); @@ -153,8 +153,8 @@ var _obj = {}; var _data = window.atob(data).split(''); - var bytes = _data.map(i => i.charCodeAt()); - + //var bytes = _data.map(i => i.charCodeAt()); +/* _obj.light = parseInt('0x' + ('0' + bytes[0]).substr(-2) + ('0' + bytes[1]).substr( -2)); _obj.co2 = parseInt(_data[2] + _data[3] + _data[4] + _data[5] + _data[6], @@ -165,7 +165,7 @@ 10) / 10); _obj.noise = parseInt('0x' + ('0' + bytes[17]).substr(-2) + ('0' + bytes[18]).substr( -2)); - _obj.binData = bytes; + _obj.binData = bytes;*/ return _obj; }, dateTime: function($date) { var dateTime = new Date.create($date);