From 431444c47e8c19b7765ae2edcf2a37db02bb20b5 Mon Sep 17 00:00:00 2001 From: Pawel Wasowski Date: Thu, 22 Jun 2017 12:29:13 +0200 Subject: [PATCH] [SystemInfo] Fix for "BATTERY" property value change listener callbacks Callbacks called on "BATTERY" property value change threw an exception, if "lowThreshold" or "highThreshold" SystemInfoOptions were specified. [Verification] Tested in Chrome DevTools, registered callbacks work fine. Change-Id: Ie50dfb0710e9b203e072ff5336b77ff27c464031 Signed-off-by: Pawel Wasowski --- src/systeminfo/systeminfo_api.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/systeminfo/systeminfo_api.js b/src/systeminfo/systeminfo_api.js index 2e5dc4fe..bb656c04 100644 --- a/src/systeminfo/systeminfo_api.js +++ b/src/systeminfo/systeminfo_api.js @@ -898,13 +898,13 @@ function _systeminfoBatteryListenerCallback(eventObj) { for (var watchId in callbacks) { if (callbacks.hasOwnProperty(watchId)) { var listener = callbacks[watchId]; + var propObj = !listener.isArrayType ? + _createProperty(property, eventObj.result.array[0]) : + _createPropertyArray(property, eventObj.result); var executeCall = (T_.isUndefined(listener.lowThreshold) || (propObj.level <= listener.lowThreshold)) || (T_.isUndefined(listener.highThreshold) || (propObj.level >= listener.highThreshold)); - var propObj = !listener.isArrayType ? - _createProperty(property, eventObj.result.array[0]) : - _createPropertyArray(property, eventObj.result); if (executeCall) { listener.callback(propObj); } -- 2.34.1