Merge pull request elastic#65 from spalger/betterServerUrlJuggle

juggle the serverUrl between angular and non-angular worlds better
spalger · Oct 27, 2015 · 582b75d · 582b75d
2 parents bb1d5a1 + 0e994c0
commit 582b75d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/public/src/controllers/SenseController.js b/public/src/controllers/SenseController.js
@@ -49,9 +49,4 @@ require('ui/modules')
       this.serverUrl = server;
     });
   });
-
-  // sync ui changes back to the es module
-  $scope.$watch('sense.serverUrl', (serverUrl) => {
-    es.setBaseUrl(serverUrl);
-  });
 });
diff --git a/public/src/directives/navbar.html b/public/src/directives/navbar.html
@@ -12,9 +12,10 @@
     aria-label="Server Name"
     class="form-control"
     ng-focus="navbar.updateServerUrlHistory()"
+    ng-blur="navbar.commitServerUrlFormModel()"
 
     sense-uib-typeahead="url for url in navbar.serverUrlHistory"
-    ng-model="sense.serverUrl"
+    ng-model="navbar.serverUrlFormModel"
     typeahead-append-to-body="true"
     typeahead-focus-first="false"
 

diff --git a/public/src/directives/senseNavbar.js b/public/src/directives/senseNavbar.js
@@ -1,4 +1,5 @@
 const history = require('../history');
+const es = require('../es');
 
 require('ui/modules')
 .get('app/sense')
@@ -7,13 +8,21 @@ require('ui/modules')
     restrict: 'A',
     template: require('./navbar.html'),
     controllerAs: 'navbar',
-    controller: function SenseNavbarController($element) {
+    controller: function SenseNavbarController($scope, $element) {
       this.serverUrlHistory = [];
       this.updateServerUrlHistory = function () {
         this.serverUrlHistory = history.getHistoricalServers();
       };
 
       this.updateServerUrlHistory();
+
+      this.commitServerUrlFormModel = () => {
+        es.setBaseUrl(this.serverUrlFormModel);
+      };
+
+      $scope.$watch('sense.serverUrl', (serverUrl) => {
+        this.serverUrlFormModel = serverUrl;
+      });
     }
   };
 });