From f76c6d7af159ed18cab5e4412d9e3250c2ae473a Mon Sep 17 00:00:00 2001 From: Tomasz Marciniak Date: Wed, 26 Apr 2017 11:45:14 +0200 Subject: [PATCH] [Utils] Fix for undefined _console function. [Verification] Code compiles. Change-Id: I752ee4cbf05645b891a70c73419d02928c22fc0c Signed-off-by: Tomasz Marciniak --- src/utils/utils_api.js | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/utils/utils_api.js b/src/utils/utils_api.js index 08cf6596..3c4d46ed 100644 --- a/src/utils/utils_api.js +++ b/src/utils/utils_api.js @@ -973,19 +973,19 @@ var NativeManager = function(extension) { // TODO: Remove mockup if WRT implements sendRuntimeMessage // This is temporary mockup! extension.sendRuntimeMessage = extension.sendRuntimeMessage || function() { - _console.error('Runtime did not implement extension.sendRuntimeMessage!'); + xwalk.utils.error('Runtime did not implement extension.sendRuntimeMessage!'); throw new WebAPIException(WebAPIException.UNKNOWN_ERR, 'Runtime did not implement extension.sendRuntimeMessage!'); }; extension.sendRuntimeAsyncMessage = extension.sendRuntimeAsyncMessage || function() { - _console.error('Runtime did not implement extension.sendRuntimeAsyncMessage!'); + xwalk.utils.error('Runtime did not implement extension.sendRuntimeAsyncMessage!'); throw new WebAPIException(WebAPIException.UNKNOWN_ERR, 'Runtime did not implement extension.sendRuntimeAsyncMessage!'); }; extension.sendRuntimeSyncMessage = extension.sendRuntimeSyncMessage || function() { - _console.error('Runtime did not implement extension.sendRuntimeSyncMessage!'); + xwalk.utils.error('Runtime did not implement extension.sendRuntimeSyncMessage!'); throw new WebAPIException(WebAPIException.UNKNOWN_ERR, 'Runtime did not implement extension.sendRuntimeSyncMessage!'); }; @@ -1026,7 +1026,7 @@ var NativeManager = function(extension) { delete msg[this.CALLBACK_ID_KEY]; if (!_type.isFunction(this.callbacks_[id])) { - _console.error('Wrong callback identifier. Ignoring message.'); + xwalk.utils.error('Wrong callback identifier. Ignoring message.'); return; } @@ -1035,8 +1035,8 @@ var NativeManager = function(extension) { try { f(msg); } catch (e) { - _console.error('########## exception'); - _console.error(e); + xwalk.utils.error('########## exception'); + xwalk.utils.error(e); } }, 0); delete this.callbacks_[id]; @@ -1049,7 +1049,7 @@ var NativeManager = function(extension) { delete msg[this.LISTENER_ID_KEY]; if (!_type.isFunction(this.listeners_[id])) { - _console.error('Wrong listener identifier. Ignoring message.'); + xwalk.utils.error('Wrong listener identifier. Ignoring message.'); return; } @@ -1058,15 +1058,15 @@ var NativeManager = function(extension) { try { f(msg); } catch (e) { - _console.error('########## exception'); - _console.error(e); + xwalk.utils.error('########## exception'); + xwalk.utils.error(e); } }, 0); return; } - _console.error('Missing callback or listener identifier. Ignoring message.'); + xwalk.utils.error('Missing callback or listener identifier. Ignoring message.'); }.bind(this)); }; @@ -1172,7 +1172,7 @@ NativeManager.prototype.callIfPossible = function(callback) { * age: 28 * } * }); - * _console.log(result); + * xwalk.utils.log(result); * * To send async method and handle response: * bridge.async({ @@ -1227,7 +1227,7 @@ var NativeBridge = (function (extension, debug) { CallbackManager.prototype = { add: function (/*callbacks, cid?*/) { - if (debug) _console.log('bridge.CallbackManager.add'); + if (debug) xwalk.utils.log('bridge.CallbackManager.add'); var args = Array.prototype.slice.call(arguments); var c = args.shift(); var cid = args.pop(); @@ -1244,11 +1244,11 @@ var NativeBridge = (function (extension, debug) { return cid; }, remove: function (cid) { - if (debug) _console.log('bridge.CallbackManager.remove, cid: ' + cid); + if (debug) xwalk.utils.log('bridge.CallbackManager.remove, cid: ' + cid); if (_collection[cid]) delete _collection[cid]; }, call: function (cid, key, args, keep) { - if (debug) _console.log('bridge.CallbackManager.call, cid: '+ cid + ', key: ' + key); + if (debug) xwalk.utils.log('bridge.CallbackManager.call, cid: '+ cid + ', key: ' + key); var callbacks = _collection[cid]; keep = !!keep; if (callbacks) { @@ -1280,13 +1280,13 @@ var NativeBridge = (function (extension, debug) { ListenerManager.prototype = { add: function (l) { - if (debug) _console.log('bridge.ListenerManager.add'); + if (debug) xwalk.utils.log('bridge.ListenerManager.add'); var id = _next(); _listeners[id] = l; return id; }, resolve: function (id, action, data, keep) { - if (debug) _console.log('bridge.ListenerManager.resolve, id: ' + id + ', action: ' + action); + if (debug) xwalk.utils.log('bridge.ListenerManager.resolve, id: ' + id + ', action: ' + action); keep = !!keep; var l = _listeners[id]; if (l) { @@ -1296,7 +1296,7 @@ var NativeBridge = (function (extension, debug) { return l; }, remove: function (id) { - if (debug) _console.log('bridge.ListenerManager.remove, id: ' + id); + if (debug) xwalk.utils.log('bridge.ListenerManager.remove, id: ' + id); var l = _listeners[id]; if (l) { var cm = Callbacks.getInstance(); @@ -1331,12 +1331,12 @@ var NativeBridge = (function (extension, debug) { })(); var Listener = function () { - if (debug) _console.log('bridge: Listener constructor'); + if (debug) xwalk.utils.log('bridge: Listener constructor'); this.cid = null; }; Listener.prototype = { then: function (c) { - if (debug) _console.log('bridge.Listener.then'); + if (debug) xwalk.utils.log('bridge.Listener.then'); var cm = Callbacks.getInstance(); this.cid = cm.add(c, this.cid); return this; @@ -1350,7 +1350,7 @@ var NativeBridge = (function (extension, debug) { cmd: data.cmd, args: data }); - if (debug) _console.log('bridge.sync, json: ' + json); + if (debug) xwalk.utilss.log('bridge.sync, json: ' + json); var result = extension.internal.sendSyncMessage(json); var obj = JSON_.parse(result); if (obj.error) @@ -1364,7 +1364,7 @@ var NativeBridge = (function (extension, debug) { cmd: data.cmd, args: data }); - if (debug) _console.log('bridge.async, json: ' + json); + if (debug) xwalk.utils.log('bridge.async, json: ' + json); setTimeout(function () { extension.postMessage(json); }); @@ -1397,7 +1397,7 @@ var NativeBridge = (function (extension, debug) { *} */ - if (debug) _console.log('bridge.setMessageListener, json: ' + json); + if (debug) xwalk.utils.log('bridge.setMessageListener, json: ' + json); var data = JSON_.parse(json); if (data.cid && data.action) { setTimeout(function() { -- 2.34.1