Merge pull request #81 from asterics/bklaus/issue#21/fix-fs20-patchin…

…g-and-testing issue#21 always do double check on fs20.isConnected() because sometim…
asterics · Sep 29, 2017 · d5116b7 · d5116b7
2 parents a2d1572 + 75cfd3f
commit d5116b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...om/bin/ARE/data/webservice/angular/envControl/component/help/install/ecHelpInstallFs20.js b/...om/bin/ARE/data/webservice/angular/envControl/component/help/install/ecHelpInstallFs20.js
@@ -26,11 +26,9 @@ angular.module(asterics.appComponents)
             thiz.test = function () {
                 thiz.triedCheck = true;
                 thiz.isConnected = null;
-                envControlFsService.isConnected().then(function () { //do test twice because sometimes the first time is wrong?!
-                    envControlFsService.isConnected().then(function (isConnected) {
-                        thiz.isConnected = isConnected;
-                        scrollToEnd();
-                    });
+                envControlFsService.isConnected().then(function (isConnected) { //do test twice because sometimes the first time is wrong?!
+                    thiz.isConnected = isConnected;
+                    scrollToEnd();
                 });
             };
 

diff --git a/custom/bin/ARE/data/webservice/angular/envControl/service/envControlFsService.js b/custom/bin/ARE/data/webservice/angular/envControl/service/envControlFsService.js
@@ -22,7 +22,11 @@ angular.module(asterics.appServices)
         thiz.isConnected = function () {
             var def = $q.defer();
             thiz.fs20Action('1111_1111', '28').then(function () { //not defined command
-                def.resolve(true);
+                thiz.fs20Action('1111_1111', '28').then(function () { //do double check because sometimes first time is wrong
+                    def.resolve(true);
+                }, function error() {
+                    def.resolve(false);
+                });
             }, function error() {
                 def.resolve(false);
             });