X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=afm-client%2Fapp%2FFrontend%2Fwidgets%2FActionButtons%2FAppliButton.js;h=269ee81d7f50fa7fc9fda09abffad4cfc5598c9c;hb=922b183f441a6e68b55592596fa62cc6e1814f74;hp=7a32873c118b7434618729f663674bcf745b2d83;hpb=9bd23d89edbc2dad7f5da8088fa788a7632eade2;p=src%2Fapp-framework-demo.git

diff --git a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
index 7a32873..269ee81 100644
--- a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
+++ b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
@@ -30,7 +30,7 @@
             '<b class="close-button" ng-click="close()">×</b>' +
             '<img ng-src="{{icon}}">' +
             '<span class="modal-text">Application <b>{{label}}</b></span>' +
-            '<ul class="vertical icon-left primary menu-bar">' +
+            '<ul class="vertical icon-left primary menu-bar appli-menu-start">' +
             '<li class=start-{{runstatus}}><a ng-click=action("start")><i class="fi-check"> Start</i></a></li>' +
             '<li class=stop-{{runstatus}}><a ng-click=action("stop")><i class="fi-x"> Stop</i></a></li>' +
             '<li><a ng-click=action("info")><i class="fi-info"> Info</i></a></li>' +
@@ -42,7 +42,7 @@
             '<b class="close-button" ng-click="close()">×</b>' +
             '<img ng-src="{{icon}}">' +
             '<span class="modal-text">Application <b>{{label}}</b></span>' +
-            '<ul class="vertical icon-left">' +
+            '<ul class="vertical icon-left appli-menu-info">' +
             '<li><i class="fi-paperclip"> Name : {{detail.name}} </i></li>' +
             '<li><i class="fi-info"> Description {{detail.description}}</i></li>' +
             '<li><i class="fi-torso"> Author : {{detail.author}}</i></li>' +
@@ -50,29 +50,34 @@
             '';
 
     angular.module('AppliButton', [])
-            .directive('appliButton', function (AppConfig, AppCall, ModalFactory, Notification, $timeout, $window, $location) {
+            .directive('appliButton', function (AppConfig, AppCall, ModalFactory, Notification, $timeout, $window, $location, urlquery) {
 
                 function mymethods(scope, elem, attrs) {
                     scope.runstatus = "stop";
+                    scope.runmode   = urlquery.runmode || "auto";
                     scope.clicked = function () {
 
-                        var notifyError = function(api, response) {
-                            Notification.error ({message: "Fail /api/afm-main" + api + "=" + scope.label + " RunID="+ scope.appID, delay: 5000});
+                        var notifyError = function(action, response) {
+                            Notification.error ({message: "Fail /api/afm-main" + action + "=" + scope.label + " RunID="+ scope.appID, delay: 5000});
                             elem.addClass ("fail");
                             elem.removeClass ("success");
-                            scope.callback (scope.appID, api, response);
+                            scope.callback (scope.appID, action, response);
                         };
                         
-                        var notifySuccess = function (api, response) {
+                        var notifySuccess = function (action, response) {
                             elem.removeClass ("fail");
                             scope.runID = response.data.response.runid;
-                            scope.callback (scope.appID, "/api/afm-main/start", response);
+                            scope.callback (scope.appID, action, response);
                         };
                         
-                        var closeModal = function() {
-                            console.log ("Modal Closing");
-                            scope.modal.deactivate();
-                            $timeout (function() {scope.modal.destroy();}, 1000);
+                        var closeModApp = function() {
+                            scope.modApp.deactivate();
+                            $timeout (function() {scope.modApp.destroy();}, 1000);
+                        };
+                        
+                        var closeModInfo = function() {
+                            scope.modInfo.deactivate();
+                            $timeout (function() {scope.modInfo.destroy();}, 1000);
                         };
                         
                         var actionModal = function(action) {
@@ -81,15 +86,15 @@
                                 
                                 case "start":
                                     if (scope.runstatus !== "stop") return;
-                                    AppCall.get ("afm-main", "start", {id: scope.appID, mode: "remote"}, function(response) {
-                                        if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+                                    AppCall.get ("afm-main", "start", {id: scope.appID, mode: scope.runmode}, function(response) {
+                                        if (response.status !== 200 || response.data.jtype !== "afb-reply") {
                                             notifyError ("start", response);
                                             return;
                                         }
                                         scope.runstatus="start";
-                                        notifySuccess ("start", response);
+                                        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;
                                     
@@ -97,36 +102,42 @@
                                     if (scope.runstatus !== "start") return;
                                     
                                     AppCall.get ("afm-main", "terminate", {runid: scope.runID}, function(response) {
-                                        if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+                                        if (response.status !== 200 || response.data.jtype !== "afb-reply") {
                                             notifyError ("stop", response);
                                             return;
                                         }
                                         scope.runstatus="stop";
-                                        notifySuccess ("stop", response);
+                                        
+                                        // 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;
                                         
                                 case "info":
                                     AppCall.get ("afm-main", "detail", {id: scope.appID}, function(response) {
-                                        if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+                                        if (response.status !== 200 || response.data.jtype !== "afb-reply") {
                                             notifyError ("detail", response);
                                             return;
                                         }
                                                                                
                                         // reference http://foundation.zurb.com/apps/docs/#!/angular-modules
                                         var config = {
-                                            id: 'appliInfoMenu',
                                             animationIn: 'slideInFromTop',
                                             contentScope: {
-                                                close   : closeModal,
+                                                close   : closeModInfo,
                                                 icon    : scope.icon,
                                                 label   : scope.appID,
                                                 detail  : response.data.response
                                             }, template : tmplDetail
                                         }; 
                                         // Popup Modal to render application data
-                                        scope.modal = new ModalFactory(config);
-                                        scope.modal.activate ();
+                                        scope.modInfo = new ModalFactory(config);
+                                        scope.modInfo.activate ();
 
                                     });
                                     break;
@@ -134,12 +145,12 @@
                                 case "uninstall":
                                     if (scope.runstatus !== "stop") return;
                                     AppCall.get ("afm-main", "uninstall", {id: scope.appID}, function(response) {
-                                        if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+                                        if (response.status !== 200 || response.data.jtype !== "afb-reply") {
                                             notifyError ("uninstall", response);
                                             return;
                                         }
                                         
-                                        notifySuccess ("uninstall", response);
+                                        notifySuccess (action, response);
                                     });
                                     break;
 
@@ -148,24 +159,23 @@
                                     break;
                             }
                             
-                            closeModal();
+                            closeModApp();
                         };
             
                         // reference http://foundation.zurb.com/apps/docs/#!/angular-modules
                         var config = {
-                            id: 'appliActionMenu',
                             animationIn: 'slideInFromTop',
                             contentScope: {
                                 action   : actionModal,
                                 runstatus: scope.runstatus,
-                                close    : closeModal,
+                                close    : closeModApp,
                                 icon     : scope.icon,
                                 label    : scope.label
                             }, template  : tmplModal
                         }; 
                         // Popup Modal to render application data
-                        scope.modal = new ModalFactory(config);
-                        scope.modal.activate ();
+                        scope.modApp = new ModalFactory(config);
+                        scope.modApp.activate ();
                     };
 
                     // extract application information from AppID+Store