From: Piotr Kosko <p.kosko@samsung.com>
Date: Wed, 30 Aug 2017 10:43:40 +0000 (+0200)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20170830.121557^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F146792%2F1;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen

Change-Id: Id6bc8bcefb795e2396569651da9df14b7c168dd0
---

ecef84fdb8ac30724db04e86d73878f4e38ed25b
diff --cc src/sensor/sensor_api.js
index f0542993,df4aeb92..1342f843
--- a/src/sensor/sensor_api.js
+++ b/src/sensor/sensor_api.js
@@@ -159,11 -157,17 +159,19 @@@ var _sensorListeners = 
      'GRAVITY'     : {},
      'GYROSCOPE'   : {},
      'GYROSCOPE_ROTATION_VECTOR' : {},
 -    'LINEAR_ACCELERATION' : {}
 +    'LINEAR_ACCELERATION' : {},
 +    'MAGNETIC_UNCALIBRATED' : {},
 +    'GYROSCOPE_UNCALIBRATED' : {}
  };
  
+ var errorWrapper = function (err) {
+     if(err.name === "UnknownError") {
+         err = new WebAPIException(WebAPIException.ABORT_ERR, err.message);
+     }
+ 
+     native_.callIfPossible(this.errorCallback, err);
+ };
+ 
  var _listener = function(object) {
      if (object.sensorType.startsWith('LED_')) {
          object.sensorType = 'HRM_RAW';
@@@ -617,81 -596,9 +604,74 @@@ LinearAccelerationSensor.prototype.getL
         }
      ]);
  
-     function errorWrapper(err) {
-         if (err.name === "UnknownError") {
-             args.errorCallback(new WebAPIException(WebAPIException.ABORT_ERR, err.message));
-         } else {
-             args.errorCallback(err);
-         }
-     }
-     _sensorListeners[this.sensorType].getData(args.successCallback, errorWrapper);
+     _sensorListeners[this.sensorType].getData(args.successCallback, errorWrapper.bind(args));
  };
  
 +//// MagneticUncalibratedSensor
 +var MagneticUncalibratedSensor = function(data) {
 +    Sensor.call(this, SensorType.MAGNETIC_UNCALIBRATED);
 +};
 +
 +MagneticUncalibratedSensor.prototype = new Sensor();
 +
 +MagneticUncalibratedSensor.prototype.constructor = Sensor;
 +
 +MagneticUncalibratedSensor.prototype.getMagneticUncalibratedSensorData = function() {
 +    var args = validator_.validateArgs(arguments, [
 +        {
 +            name : 'successCallback',
 +            type : types_.FUNCTION
 +        },
 +        {
 +            name : 'errorCallback',
 +            type : types_.FUNCTION,
 +            optional : true,
 +            nullable : true
 +        }
 +    ]);
 +
 +    function errorWrapper(err) {
 +        if (err.name === "UnknownError") {
 +            args.errorCallback(new WebAPIException(WebAPIException.ABORT_ERR, err.message));
 +        } else {
 +            args.errorCallback(err);
 +        }
 +    }
 +    _sensorListeners[this.sensorType].getData(args.successCallback, errorWrapper);
 +}
 +
 +//// GyroscopeUncalibratedSensor
 +var GyroscopeUncalibratedSensor = function(data) {
 +    Sensor.call(this, SensorType.GYROSCOPE_UNCALIBRATED);
 +};
 +
 +GyroscopeUncalibratedSensor.prototype = new Sensor();
 +
 +GyroscopeUncalibratedSensor.prototype.constructor = Sensor;
 +
 +GyroscopeUncalibratedSensor.prototype.getGyroscopeUncalibratedSensorData = function() {
 +    var args = validator_.validateArgs(arguments, [
 +        {
 +            name : 'successCallback',
 +            type : types_.FUNCTION
 +        },
 +        {
 +            name : 'errorCallback',
 +            type : types_.FUNCTION,
 +            optional : true,
 +            nullable : true
 +        }
 +    ]);
 +
 +    function errorWrapper(err) {
 +        if (err.name === "UnknownError") {
 +            args.errorCallback(new WebAPIException(WebAPIException.ABORT_ERR, err.message));
 +        } else {
 +            args.errorCallback(err);
 +        }
 +    }
 +    _sensorListeners[this.sensorType].getData(args.successCallback, errorWrapper);
 +}
  
  ////////////////////// Sensor Data classes/////////////////////////////////////////////////////
  ////Base SensorData class