diff options
| author |   Fulup Ar Foll <fulup@iot.bzh> | 2016-02-17 12:00:46 +0100 |
|---|---|---|
| committer |   José Bollo <jose.bollo@iot.bzh> | 2016-02-17 12:05:10 +0100 |
| commit | d47fd84a6a16b1c9c4b4ce5a3279b9ecaea54c1b (patch) | |
| tree | 231d0b6732c552e3d7855305ccd2a9162c04cd6a /afm-client/app/Frontend | |
| parent | 3482263a53803b6e7662e67b39ed97bdd9fcef13 (diff) | |
Implement closing windows of remote launchs
Change-Id: Ibcaa672271b1da94dd87291ea0531b5c520fa373
Diffstat (limited to 'afm-client/app/Frontend')
| -rw-r--r-- | afm-client/app/Frontend/etc/AppConfig.js | 2 | ||||
| -rw-r--r-- | afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/afm-client/app/Frontend/etc/AppConfig.js b/afm-client/app/Frontend/etc/AppConfig.js index e14dcef..be5a107 100644 --- a/afm-client/app/Frontend/etc/AppConfig.js +++ b/afm-client/app/Frontend/etc/AppConfig.js @@ -36,8 +36,6 @@ var myCalls = { get : function(plugin, action, query, callback) { if (!query.token) query.token = AppConfig.session.token; // add token to provided query - $log.log ('AppCall.get /api/' + plugin + '/' + action + '?' + query); - $log.log (callback); $http.get('/api/' + plugin + '/' + action , {params: query}).then (callback, callback); } diff --git a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js index 014fe4d..b7acb6b 100644 --- a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js +++ b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js @@ -90,7 +90,7 @@ scope.runstatus="start"; notifySuccess (action, response); if(response.data.response.uri) - $window.open(response.data.response.uri.replace("%h", $location.host())); + scope.winapp= $window.open(response.data.response.uri.replace("%h", $location.host())); }); break; @@ -103,6 +103,13 @@ return; } scope.runstatus="stop"; + + // if a remote window app was open let's close it + if (scope.winapp) { + console.log ("Closing Application Window label=%s id=%s", scope.label, scope.appID); + scope.winapp.close(); + scope.winapp=false; + } notifySuccess (action, response); }); break; |