From: jaekuk lee Date: Wed, 26 Jun 2019 00:53:11 +0000 (+0000) Subject: Merge "[VD] Support RWI feature" into tizen X-Git-Tag: submit/tizen/20190814.020427~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f752e10f49f5d11738c5fe3664a559517402fb46;p=platform%2Fframework%2Fweb%2Fwrtjs.git Merge "[VD] Support RWI feature" into tizen --- f752e10f49f5d11738c5fe3664a559517402fb46 diff --cc wrt_app/src/runtime.js index add271c3,d7daa36d..02af0d83 mode 100755,100644..100644 --- a/wrt_app/src/runtime.js +++ b/wrt_app/src/runtime.js @@@ -27,9 -27,10 +27,10 @@@ class Runtime constructor(options) { this.webApplication = null; this.handleIpcMessages(); - this.extensionManager = null; + this.addonManager = null; this.isLaunched = false; this.debug_mode = false; + this.need_inspector = false; var _this = this; app.on('before-quit', function(event) { @@@ -165,26 -172,37 +166,37 @@@ killAllProcesses() {} handleIpcMessages() { var _this = this; - ipcMain.on(IPC_MESSAGE.EXTENSIONS.INSTALLED, (sender, name) => { + ipcMain.on(IPC_MESSAGE.ADDONS.INSTALLED, (sender, name) => { console.log('handleIpcMessages: INSTALLED ' + name); - _this.extensionManager.build(); - return _this.extensionManager.activate(app, name); + _this.addonManager.build(); + return _this.addonManager.activate(app, name); }); - ipcMain.on(IPC_MESSAGE.EXTENSIONS.UNINSTALLED, (sender, name) => { + ipcMain.on(IPC_MESSAGE.ADDONS.UNINSTALLED, (sender, name) => { console.log('handleIpcMessages: UNINSTALLED ' + name); - return _this.extensionManager.deactivate(app, name); + return _this.addonManager.deactivate(app, name); }); - ipcMain.on(IPC_MESSAGE.EXTENSIONS.ACTIVATE, (sender, name) => { + ipcMain.on(IPC_MESSAGE.ADDONS.ACTIVATE, (sender, name) => { console.log('handleIpcMessages: ACTIVATE ' + name); - return _this.extensionManager.activate(app, name); + return _this.addonManager.activate(app, name); }); - ipcMain.on(IPC_MESSAGE.EXTENSIONS.DEACTIVATE, (sender, name) => { + ipcMain.on(IPC_MESSAGE.ADDONS.DEACTIVATE, (sender, name) => { console.log('handleIpcMessages: DEACTIVATE ' + name); - return _this.extensionManager.deactivate(app, name); + return _this.addonManager.deactivate(app, name); }); } + checkInspectorCondition(appControl) { + var _this = this; + let bundle_debug = (appControl.getData('__AUL_DEBUG__') === "1"); + _this.need_inspector = wrt.needUseInspector(); + return (bundle_debug || _this.need_inspector); + } launchInspector(appControl) { - var data = { "port" : [ wrt.getDebuggingPort().toString() ] }; + var _this = this; + var portnum = wrt.getDebuggingPort(); + var data = { "port" : [ portnum.toString() ] }; + if(_this.need_inspector) { + _this.webApplication.debugport = portnum; + } appControl.reply(data); } } diff --cc wrt_app/src/web_application.js index f14d68b3,2c35351b..69f45a85 mode 100755,100644..100644 --- a/wrt_app/src/web_application.js +++ b/wrt_app/src/web_application.js