Merge pull request #630 from B3nCr/squashed-bs-time

Use new angular-bootstrap attribute directive instead of element dire…
vitalets · Mar 7, 2017 · 0de8919 · 0de8919
2 parents d45d23d + 0b6b903
commit 0de8919
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -38,7 +38,7 @@
     "moment": "^2.17.1",
     "checklist-model": "^0.10.0",
     "ng-tags-input": "^3.1.1",
-    "angular-bootstrap": "^1.3.3",
+    "angular-bootstrap": "^2.5.0",
     "angular-ui-select": "^0.16.1",
     "jquery-ui": "^1.12.1",
     "angular-ui-date": "^1.0.1"

diff --git a/index.html b/index.html
@@ -17,6 +17,7 @@
     <link href="docs/css/docs.css" rel="stylesheet" media="screen">
     <!--angular-->
     <script src="bower_components/angular/angular.js"></script>
+    <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
     <script src="bower_components/angular-mocks/angular-mocks.js"></script>
     <!--jquery (needed for bootstrap)-->
     <script src="bower_components/jquery/dist/jquery.js"></script>
@@ -37,7 +38,7 @@
     <!--app-->
     <script src="docs/js/app.js"></script>
     <!--xeditable-->
-    <script src="dist/js/xeditable.min.js"></script>
+    <script src="dist/js/xeditable.js"></script>
   </head>
   <body data-spy="scroll" data-target=".sidebar">
     <nav role="navigation" class="navbar navbar-default navbar-fixed-top">

diff --git a/src/js/directives/bstime.js b/src/js/directives/bstime.js
@@ -6,7 +6,7 @@ angular.module('xeditable').directive('editableBstime', ['editableDirectiveFacto
   function(editableDirectiveFactory) {
     return editableDirectiveFactory({
       directiveName: 'editableBstime',
-      inputTpl: '<uib-timepicker></uib-timepicker>',
+      inputTpl: '<div uib-timepicker></div>',
       render: function() {
         this.parent.render.call(this);