Use ui-boostrap instead of angular-strap

alechenninger · Apr 5, 2015 · f4cf82e · f4cf82e
1 parent 3c89d6c
commit f4cf82e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 32 deletions.
diff --git a/data-mgmt/src/main/webapp/index.html b/data-mgmt/src/main/webapp/index.html
@@ -15,7 +15,7 @@
 
     <!-- Custom styles for this template -->
     <link href="bower_components/bootstrap/dist/css/bootstrap-theme.css" rel="stylesheet">
-    <link href='bower_components/jsoneditor/jsoneditor.css' rel='stylesheet'>
+    <link href='bower_components/jsoneditor/dist/jsoneditor.css' rel='stylesheet'>
     <link href="bower_components/angular-ui-select/dist/select.css" rel="stylesheet">
 
     <link href="css/theme.css" rel="stylesheet">
@@ -48,9 +48,19 @@
             <li ng-class="{active: isActive('/update')}"><a href="#/update">Update</a></li>
             <li ng-class="{active: isActive('/delete')}"><a href="#/delete">Delete</a></li>
           </ul>
+          <!-- Right aligned nav items -->
           <ul class="nav navbar-nav navbar-right">
-            <li class="dropdown">
-              <a href="" class="dropdown-toggle" bs-dropdown="environmentsDropdown">{{isEnvironmentSelected() ? environment.alias : "Select an environment"}} <span class="caret"></span></a>
+            <li class="dropdown" dropdown>
+              <a href class="dropdown-toggle" dropdown-toggle>
+                {{isEnvironmentSelected() ? environment.alias : "Select an environment"}} <span class="caret"></span>
+              </a>
+              <ul class="dropdown-menu" role="menu">
+                <li ng-repeat="env in environments" ng-click="setEnvironmentByAlias(env.alias)">
+                  <a href>{{env.alias}}</a>
+                </li>
+                <li class="divider"></li>
+                <li><a href="#/environments">Manage environments</a></li>
+              </ul>
             </li>
             <li ng-class="{active: isActive('/environments')}"><a href="#/environments">Manage environments</a></li>
           </ul>
@@ -70,15 +80,12 @@
 
     <!-- Angular directives -->
     <script src="bower_components/angular-ui-select/dist/select.js"></script>
+    <script src="bower_components/angular-ui-bootstrap-bower/ui-bootstrap-tpls.js"></script>
     <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
-    <script src="bower_components/angular-strap/dist/angular-strap.js"></script>
-    <script src="bower_components/angular-strap/dist/angular-strap.tpl.js"></script>
 
     <!-- Other components -->
     <script src="bower_components/jquery/dist/jquery.js"></script>
-    <script src="bower_components/jsoneditor/jsoneditor.js"></script>
-    <script src="bower_components/jsoneditor/asset/ace/ace.js"></script>
-    <script src="bower_components/jsoneditor/asset/jsonlint/jsonlint.js"></script>
+    <script src="bower_components/jsoneditor/dist/jsoneditor.js"></script>
     <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
     <script src="bower_components/lightblue.js/dist/lightblue.min.js"></script>
 

diff --git a/data-mgmt/src/main/webapp/js/app.js b/data-mgmt/src/main/webapp/js/app.js
@@ -14,7 +14,7 @@ var datamgmt = angular.module("datamgmt", [
 
   // 3rd party
   "ui.select",
-  "mgcrea.ngStrap"
+  "ui.bootstrap"
 ]);
 
 datamgmt.config(["$routeProvider", function($routeProvider) {

diff --git a/data-mgmt/src/main/webapp/js/controllers.js b/data-mgmt/src/main/webapp/js/controllers.js
@@ -3,6 +3,7 @@
 var dataManageControllers = angular.module("dataManageControllers", ["dataManageFilters"]);
 
 (function() {
+
   dataManageControllers.controller("NavCtrl", ["$scope", "$location",
     function($scope, $location) {
       $scope.isActive = function(path) {
@@ -48,18 +49,6 @@ var dataManageControllers = angular.module("dataManageControllers", ["dataManage
         $scope.setEnvironment(envs[0]);
       };
 
-      $scope.populateEnvironmentsDropdown = function() {
-        $scope.environmentsDropdown = $scope.environments.map(function(e) {
-          return {
-            text: e.alias,
-            click: "setEnvironmentByAlias('" + e.alias + "')"
-          };
-        }).concat({ divider: true },
-            { text: "Manage environments", href: "#environments" });
-      };
-
-      $scope.populateEnvironmentsDropdown();
-
       $scope.isEnvironmentSelected = function() {
         return angular.isDefined($scope.environment);
       };
@@ -92,11 +81,6 @@ var dataManageControllers = angular.module("dataManageControllers", ["dataManage
         environmentService.addEnvironment(env);
         $scope.environments.push(env);
 
-        $scope.environmentsDropdown.splice(-2, 0, {
-            text: env.alias,
-            click: "setEnvironmentByAlias('" + env.alias + "')"
-          });
-
         if (!$scope.isEnvironmentSelected()) {
           $scope.setEnvironment(env);
         }
@@ -109,12 +93,6 @@ var dataManageControllers = angular.module("dataManageControllers", ["dataManage
 
         $scope.environments.splice($scope.environments.indexOf(env), 1);
 
-        var indexInEnvironmentsDropdown = $scope.environmentsDropdown
-            .map(function(e) { return e.text; })
-            .indexOf(env.alias);
-
-        $scope.environmentsDropdown.splice(indexInEnvironmentsDropdown, 1);
-
         if ($scope.isEnvironmentSelected() && $scope.environment.alias === env.alias) {
           $scope.unsetEnvironment();
         }