Removed angular ui bootstrap.

gofore · Apr 14, 2015 · ac609ce · ac609ce
1 parent c9d034b
commit ac609ce
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/workshop/complete/aws-workshop-ui/pom.xml b/workshop/complete/aws-workshop-ui/pom.xml
@@ -71,10 +71,6 @@
       <groupId>org.webjars</groupId>
       <artifactId>angularjs</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>angular-ui-bootstrap</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>ngInfiniteScroll</artifactId>

diff --git a/workshop/complete/aws-workshop-ui/src/main/resources/static/assets/js/aws-workshop.js b/workshop/complete/aws-workshop-ui/src/main/resources/static/assets/js/aws-workshop.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('aws', ['ngMessages', 'infinite-scroll', 'ui.bootstrap'])
+angular.module('aws', ['ngMessages', 'infinite-scroll'])
 .controller('QueryCtrl', ['$scope', '$http', function($scope, $http) {
     $scope.submit = function() {
         if ($scope.query) {

diff --git a/workshop/complete/aws-workshop-ui/src/main/resources/static/index.html b/workshop/complete/aws-workshop-ui/src/main/resources/static/index.html
@@ -4,15 +4,15 @@
     <meta charset="utf-8">
     <link rel="stylesheet" type="text/css" href="/webjars/bootstrap/3.3.4/css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="/assets/css/aws-workshop.css">
-
+
+    <script src="/webjars/bootstrap/3.3.4/js/bootstrap.min.js"></script>
     <script src="/webjars/jquery/2.1.3/jquery.min.js"></script>
     <script src="/webjars/lodash/3.6.0/lodash.min.js"></script>
     <script src="/webjars/angularjs/1.3.15/angular.min.js"></script>
     <script src="/webjars/angularjs/1.3.15/angular-resource.min.js"></script>
     <script src="/webjars/angularjs/1.3.15/angular-route.min.js"></script>
     <script src="/webjars/angularjs/1.3.15/angular-messages.min.js"></script>
     <script src="/webjars/ngInfiniteScroll/1.1.2/ng-infinite-scroll.js"></script>
-    <script src="/webjars/angular-ui-bootstrap/0.12.1-1/ui-bootstrap.min.js"></script>
     <script src="/assets/js/aws-workshop.js"></script>
 </head>
 <body>
@@ -49,12 +49,12 @@
             </div>
             <div ng-controller="SearchCtrl" class="panel panel-default">
                 <div class="panel-heading"><h2>Search<img class="pull-right" ng-show="loading" src="/assets/img/ajax-loader.gif"></h2></div>
-                <div class="panel-body">
+                <div class="panel-body">-
                     <div class="input-group">
                         <input ng-model="query" ng-keypress="($event.which === 13)?search(query, 20):0" type="text" class="form-control">
-                        <div class="input-group-btn" dropdown>
+                        <div class="input-group-btn">
                             <button type="button" class="btn btn-info" ng-click="search(query, 20)">Go!</button>
-                            <button type="button" class="btn btn-info dropdown-toggle">
+                            <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                                 <span class="caret"></span>
                                 <span class="sr-only">Toggle Dropdown</span>
                             </button>

diff --git a/workshop/complete/pom.xml b/workshop/complete/pom.xml
@@ -209,11 +209,6 @@
         <artifactId>angularjs</artifactId>
         <version>1.3.15</version>
       </dependency>
-      <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>angular-ui-bootstrap</artifactId>
-        <version>0.12.1-1</version>
-      </dependency>
       <dependency>
         <groupId>org.webjars</groupId>
         <artifactId>ngInfiniteScroll</artifactId>