From 97519f2a1017970844bc1e081aa336547ccd697f Mon Sep 17 00:00:00 2001
From: Dave Martin <dwmartin41@gmail.com>
Date: Tue, 30 Dec 2014 16:32:36 +0000
Subject: [PATCH 1/3] feat(bsProgressbar): add bsProgressbar directive

add a directive for a progress bar, with tests and docs

resolve #379
---
 docs/index.html                            |  3 +
 docs/views/affixed-sidebar.html            |  9 +++
 docs/views/sidebar.html                    |  9 +++
 src/module.js                              |  3 +-
 src/progressbar/docs/progressbar.demo.html | 76 ++++++++++++++++++++
 src/progressbar/docs/progressbar.demo.js   | 14 ++++
 src/progressbar/progressbar.js             | 40 +++++++++++
 src/progressbar/progressbar.tpl.html       |  8 +++
 src/progressbar/test/progressbar.spec.js   | 84 ++++++++++++++++++++++
 9 files changed, 245 insertions(+), 1 deletion(-)
 create mode 100644 src/progressbar/docs/progressbar.demo.html
 create mode 100644 src/progressbar/docs/progressbar.demo.js
 create mode 100644 src/progressbar/progressbar.js
 create mode 100644 src/progressbar/progressbar.tpl.html
 create mode 100644 src/progressbar/test/progressbar.spec.js

diff --git a/docs/index.html b/docs/index.html
index db3099de1..0f91f3028 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -80,6 +80,7 @@
           <div ng-include="'navbar/docs/navbar.demo.html'"></div>
           <div ng-include="'scrollspy/docs/scrollspy.demo.html'"></div>
           <div ng-include="'affix/docs/affix.demo.html'"></div>
+          <div ng-include="'progressbar/docs/progressbar.demo.html'"></div>
         </div>
       </div>
     </div>
@@ -124,6 +125,7 @@
   <script src="affix/affix.js"></script>
   <script src="tab/tab.js"></script>
   <script src="collapse/collapse.js"></script>
+  <script src="progressbar/progressbar.js"></script>
   <!-- endbuild -->
 
   <!-- build:lib scripts/angular-strap.tpl.min.js -->
@@ -158,6 +160,7 @@
   <script src="typeahead/docs/typeahead.demo.js"></script>
   <script src="tab/docs/tab.demo.js"></script>
   <script src="collapse/docs/collapse.demo.js"></script>
+  <script src="progressbar/docs/progressbar.demo.js"></script>
   <!-- endbuild -->
 
   <!-- Analytics
diff --git a/docs/views/affixed-sidebar.html b/docs/views/affixed-sidebar.html
index 3a0ad7f34..2aa956bc0 100644
--- a/docs/views/affixed-sidebar.html
+++ b/docs/views/affixed-sidebar.html
@@ -163,6 +163,15 @@
         </li>
       </ul>
     </li>
+     <li>
+       <a href="#progressbar">Progress Bar</a>
+       <ul class="nav">
+         <li><a href="#progressbar-examples">Examples</a>
+         </li>
+         <li><a href="#progressbar-usage">Usage</a>
+         </li>
+       </ul>
+     </li>
 <!--
 
     <li>
diff --git a/docs/views/sidebar.html b/docs/views/sidebar.html
index c5a33b29c..eaa8f5e22 100644
--- a/docs/views/sidebar.html
+++ b/docs/views/sidebar.html
@@ -162,6 +162,15 @@
         </li>
       </ul>
     </li>
+    <li>
+      <a href="#progressbar">Progress Bar</a>
+      <ul class="nav">
+        <li><a href="#progressbar-examples">Examples</a>
+        </li>
+        <li><a href="#progressbar-usage">Usage</a>
+        </li>
+      </ul>
+    </li>
 <!--
 
     <li>
diff --git a/src/module.js b/src/module.js
index b9bbd2753..f76049093 100644
--- a/src/module.js
+++ b/src/module.js
@@ -15,5 +15,6 @@ angular.module('mgcrea.ngStrap', [
   'mgcrea.ngStrap.scrollspy',
   'mgcrea.ngStrap.affix',
   'mgcrea.ngStrap.tab',
-  'mgcrea.ngStrap.collapse'
+  'mgcrea.ngStrap.collapse',
+  'mgcrea.ngStrap.progressbar'
 ]);
diff --git a/src/progressbar/docs/progressbar.demo.html b/src/progressbar/docs/progressbar.demo.html
new file mode 100644
index 000000000..1d5b2389e
--- /dev/null
+++ b/src/progressbar/docs/progressbar.demo.html
@@ -0,0 +1,76 @@
+<div class="bs-docs-section" ng-controller="ProgressbarDemoCtrl">
+
+  <div class="page-header">
+    <h1 id="progressbar">Progress Bar <a class="small" href="//github.com/mgcrea/angular-strap/blob/master/src/progressbar/progressbar.js" target="_blank">progressbar.js</a>
+    </h1>
+    <code>mgcrea.ngStrap.progressbar</code>
+  </div>
+
+
+  <h2 id="progressbar-examples">Examples</h2>
+  <p>Add an animated progress bar.</p>
+
+  <h3>Live demo <a class="small edit-plunkr" data-module-name="mgcrea.ngStrapDocs" data-content-html-url="progressbar/docs/progressbar.demo.html" data-content-js-url="progressbar/docs/progressbar.demo.js" ng-plunkr data-title="edit in plunker" data-placement="right" bs-tooltip></a></h3>
+  <div class="bs-example" append-source>
+    <bs-progressbar value="value">{{value}}%</bs-progressbar>
+  </div>
+
+  <h2 id="progressbar-usage">Usage</h2>
+  <p>Add a <code>bs-progressbar</code> element to create a progress bar</p>
+  <p>HTML within the <code>bs-progressbar</code> element will be transcluded.</p>
+
+
+  <h3>Options</h3>
+  <p>Options can be passed via data attributes, append the option name to <code>data-</code>, as in <code>data-route-attr=""</code>.</p>
+  <div class="table-responsive">
+    <table class="table table-bordered table-striped">
+      <thead>
+        <tr>
+          <th style="width: 100px;">Name</th>
+          <th style="width: 100px;">type</th>
+          <th style="width: 50px;">default</th>
+          <th>description</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>value</td>
+          <td>number</td>
+          <td>0</td>
+          <td>Current value of the progress bar. Should be between 0 and 100.</td>
+        </tr>
+        <tr>
+          <td>animate</td>
+          <td>boolean expression</td>
+          <td>true</td>
+          <td>Toggles whether the progress bar is animated.</td>
+        </tr>
+        <tr>
+          <td>type</td>
+          <td>string</td>
+          <td>null</td>
+          <td>Determines the type of the progress bar. Can be success, info, warning, danger, or null for the default type.</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="callout callout-info">
+    <h4>Default options</h4>
+    <p>You can override global defaults for the plugin with <code>$progressbar.defaults</code></p>
+    <div class="highlight">
+      <pre class="bs-exemple-code">
+        <code class="javascript" highlight-block>
+          angular.module('myApp')
+          .config(function($progressbar) {
+            angular.extend($progressbar.defaults, {
+              animate: false,
+              barType: 'warning'
+            });
+          })
+        </code>
+      </pre>
+    </div>
+  </div>
+
+</div>
+
diff --git a/src/progressbar/docs/progressbar.demo.js b/src/progressbar/docs/progressbar.demo.js
new file mode 100644
index 000000000..ea0440053
--- /dev/null
+++ b/src/progressbar/docs/progressbar.demo.js
@@ -0,0 +1,14 @@
+'use strict';
+
+angular.module('mgcrea.ngStrapDocs')
+
+.controller('ProgressbarDemoCtrl', function($scope, $interval) {
+  $scope.value = 50;
+
+    $interval(function (){
+      if($scope.value < 100)
+        $scope.value+=10;
+      else
+        $scope.value = 0;
+    }, 2000);
+});
diff --git a/src/progressbar/progressbar.js b/src/progressbar/progressbar.js
new file mode 100644
index 000000000..27d509e43
--- /dev/null
+++ b/src/progressbar/progressbar.js
@@ -0,0 +1,40 @@
+'use strict';
+
+angular.module('mgcrea.ngStrap.progressbar', [])
+.provider('$progressbar', function (){
+    var defaults = {
+      barType: '',
+      animate: function (){ return true;}
+    };
+
+    this.$get = function (){
+      return {
+        defaults: defaults
+      };
+    };
+  })
+  .directive('bsProgressbar', function ($progressbar){
+    return {
+      restrict: 'E',
+      transclude: true,
+      replace: true,
+      templateUrl: 'progressbar/progressbar.tpl.html',
+      scope:{
+        value: '=',
+        type: '@',
+        animate: '&'
+      },
+      link: function (scope, element, attr){
+        scope.type = scope.type || $progressbar.defaults.barType;
+        scope.animate = angular.isDefined(scope.animate()) ? scope.animate : $progressbar.defaults.animate;
+        scope.$watch('type', function (){
+          if(scope.type) {
+            scope.barClass = 'progress-bar-' + scope.type;
+          }
+          else{
+            scope.barClass = null;
+          }
+        });
+      }
+    };
+  });
diff --git a/src/progressbar/progressbar.tpl.html b/src/progressbar/progressbar.tpl.html
new file mode 100644
index 000000000..ea75680e2
--- /dev/null
+++ b/src/progressbar/progressbar.tpl.html
@@ -0,0 +1,8 @@
+<div class="progress">
+  <div class="progress-bar" ng-class="barClass" role="progressbar" aria-valuenow="{{value}}"
+       aria-valuemin="0" aria-valuemax="100"
+       ng-style="{width: value + '%', 'webkit-transition': animate() ? null : 'none', 'transition': animate() ? null : 'none'}">
+        <span class="sr-only">{{value}}%</span>
+        <div ng-transclude></div>
+       </div>
+</div>
diff --git a/src/progressbar/test/progressbar.spec.js b/src/progressbar/test/progressbar.spec.js
new file mode 100644
index 000000000..be36688aa
--- /dev/null
+++ b/src/progressbar/test/progressbar.spec.js
@@ -0,0 +1,84 @@
+'use strict';
+
+describe('progressbar', function () {
+  beforeEach(module('mgcrea.ngStrap.progressbar'));
+
+  var templates = {
+    'default': {
+      element: '<bs-progressbar animate="animate" type="{{type}}" value="value"><span>{{value}}%</span></bs-progressbar>',
+      scope: {
+        value: 50
+      }
+    }
+  };
+  var  scope, $compile;
+  beforeEach(inject(function (_$compile_, $rootScope){
+    $compile = _$compile_;
+    scope = $rootScope.$new();
+  }));
+
+  afterEach(function() {
+    scope.$destroy();
+  });
+
+  function compileDirective(template, locals) {
+    template = templates[template];
+    angular.extend(scope, angular.copy(template.scope || templates['default'].scope), locals);
+    var element = $compile(template.element)(scope);
+    scope.$digest();
+    return jQuery(element[0]);
+  }
+
+  it("should correctly compile the inner content", function (){
+    var element = compileDirective('default');
+    expect(element.hasClass('progress')).toBe(true);
+
+    var bar = element.children().eq(0);
+    expect(bar.hasClass('progress-bar')).toBe(true);
+    expect(bar.css('width')).toBe(scope.value + '%');
+    expect(bar.attr('aria-valuenow')).toBe(scope.value.toString());
+    expect(bar.attr('aria-valuemin')).toBe('0');
+    expect(bar.attr('aria-valuemax')).toBe('100');
+
+    var srValue = bar.children().eq(0);
+    expect(srValue.text()).toBe(scope.value+'%');
+
+    var transcludedElem = bar.children().eq(1);
+    expect(transcludedElem.text()).toBe(scope.value+'%');
+  });
+
+  it("should update the progress bar width when the value is changed", function (){
+    var element = compileDirective('default');
+    var bar = element.children().eq(0);
+
+    expect(bar.css('width')).toBe(scope.value + '%');
+    scope.value = 10;
+    scope.$digest();
+    expect(bar.css('width')).toBe(scope.value + '%');
+  });
+
+  it("should disable css transitions if and only if animate is false", function (){
+    scope.animate = false;
+    var element = compileDirective('default');
+    var bar = element.children().eq(0);
+    // look for webkit transition because phantomjs doesn't support the "transition" css property
+    expect(bar.css('webkit-transition')).toBe('none');
+
+    scope.animate = true;
+    scope.$digest();
+    expect(bar.css('webkit-transition')).toBeFalsy();
+  });
+
+  it("should use the specified type of progress bar", function (){
+    scope.type = 'success';
+    var element = compileDirective('default');
+    var bar = element.children().eq(0);
+
+    expect(bar.hasClass('progress-bar-success')).toBe(true);
+
+    scope.type = "info";
+    scope.$digest();
+    expect(bar.hasClass('progress-bar-info')).toBe(true);
+    expect(bar.hasClass('progress-bar-success')).toBe(false);
+  });
+});

From c509a517ccb9769bf1d09e97b39a5eb5363a7b88 Mon Sep 17 00:00:00 2001
From: David Martin <dwmartin41@gmail.com>
Date: Fri, 17 Apr 2015 22:28:12 +0100
Subject: [PATCH 2/3] tweaks for progressbar directive

---
 src/progressbar/progressbar.js       | 12 ++----------
 src/progressbar/progressbar.tpl.html |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/progressbar/progressbar.js b/src/progressbar/progressbar.js
index 27d509e43..1286a7ea3 100644
--- a/src/progressbar/progressbar.js
+++ b/src/progressbar/progressbar.js
@@ -3,7 +3,7 @@
 angular.module('mgcrea.ngStrap.progressbar', [])
 .provider('$progressbar', function (){
     var defaults = {
-      barType: '',
+      type: '',
       animate: function (){ return true;}
     };
 
@@ -25,16 +25,8 @@ angular.module('mgcrea.ngStrap.progressbar', [])
         animate: '&'
       },
       link: function (scope, element, attr){
-        scope.type = scope.type || $progressbar.defaults.barType;
+        scope.type = scope.type || $progressbar.defaults.type;
         scope.animate = angular.isDefined(scope.animate()) ? scope.animate : $progressbar.defaults.animate;
-        scope.$watch('type', function (){
-          if(scope.type) {
-            scope.barClass = 'progress-bar-' + scope.type;
-          }
-          else{
-            scope.barClass = null;
-          }
-        });
       }
     };
   });
diff --git a/src/progressbar/progressbar.tpl.html b/src/progressbar/progressbar.tpl.html
index ea75680e2..5dbc5f9ab 100644
--- a/src/progressbar/progressbar.tpl.html
+++ b/src/progressbar/progressbar.tpl.html
@@ -1,5 +1,5 @@
 <div class="progress">
-  <div class="progress-bar" ng-class="barClass" role="progressbar" aria-valuenow="{{value}}"
+  <div class="progress-bar" ng-class="type ? 'progress-bar-'+type : null" role="progressbar" aria-valuenow="{{value}}"
        aria-valuemin="0" aria-valuemax="100"
        ng-style="{width: value + '%', 'webkit-transition': animate() ? null : 'none', 'transition': animate() ? null : 'none'}">
         <span class="sr-only">{{value}}%</span>

From fd9a03a649749bc8548379033037ed3f98420c1a Mon Sep 17 00:00:00 2001
From: David Martin <dwmartin41@gmail.com>
Date: Fri, 17 Apr 2015 23:44:57 +0100
Subject: [PATCH 3/3] changed progressbar animate property to an optional 2-way
 binding

---
 src/progressbar/docs/progressbar.demo.html | 2 +-
 src/progressbar/progressbar.js             | 6 +++---
 src/progressbar/progressbar.tpl.html       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/progressbar/docs/progressbar.demo.html b/src/progressbar/docs/progressbar.demo.html
index 1d5b2389e..41dbbef92 100644
--- a/src/progressbar/docs/progressbar.demo.html
+++ b/src/progressbar/docs/progressbar.demo.html
@@ -41,7 +41,7 @@ <h3>Options</h3>
         </tr>
         <tr>
           <td>animate</td>
-          <td>boolean expression</td>
+          <td>boolean</td>
           <td>true</td>
           <td>Toggles whether the progress bar is animated.</td>
         </tr>
diff --git a/src/progressbar/progressbar.js b/src/progressbar/progressbar.js
index 1286a7ea3..e6b43559c 100644
--- a/src/progressbar/progressbar.js
+++ b/src/progressbar/progressbar.js
@@ -4,7 +4,7 @@ angular.module('mgcrea.ngStrap.progressbar', [])
 .provider('$progressbar', function (){
     var defaults = {
       type: '',
-      animate: function (){ return true;}
+      animate: true
     };
 
     this.$get = function (){
@@ -22,11 +22,11 @@ angular.module('mgcrea.ngStrap.progressbar', [])
       scope:{
         value: '=',
         type: '@',
-        animate: '&'
+        animate: '=?'
       },
       link: function (scope, element, attr){
         scope.type = scope.type || $progressbar.defaults.type;
-        scope.animate = angular.isDefined(scope.animate()) ? scope.animate : $progressbar.defaults.animate;
+        scope.animate = angular.isDefined(scope.animate) ? scope.animate : $progressbar.defaults.animate;
       }
     };
   });
diff --git a/src/progressbar/progressbar.tpl.html b/src/progressbar/progressbar.tpl.html
index 5dbc5f9ab..46f0835e6 100644
--- a/src/progressbar/progressbar.tpl.html
+++ b/src/progressbar/progressbar.tpl.html
@@ -1,7 +1,7 @@
 <div class="progress">
   <div class="progress-bar" ng-class="type ? 'progress-bar-'+type : null" role="progressbar" aria-valuenow="{{value}}"
        aria-valuemin="0" aria-valuemax="100"
-       ng-style="{width: value + '%', 'webkit-transition': animate() ? null : 'none', 'transition': animate() ? null : 'none'}">
+       ng-style="{width: value + '%', 'webkit-transition': animate ? null : 'none', 'transition': animate ? null : 'none'}">
         <span class="sr-only">{{value}}%</span>
         <div ng-transclude></div>
        </div>