bump 1.0.6

victorb · Aug 27, 2014 · ce02797 · ce02797
1 parent 3646755
commit ce02797
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "ngprogress",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "main": ["build/ngProgress.js", "ngProgress.css"],
     "ignore": [
         "**/.*",

diff --git a/build/ngProgress.js b/build/ngProgress.js
@@ -1,5 +1,5 @@
 /*
- ngProgress 1.0.5 - slim, site-wide progressbar for AngularJS
+ ngProgress 1.0.6 - slim, site-wide progressbar for AngularJS
 (C) 2013 - Victor Bjelkholm 
 License: MIT 
 Source: https://github.com/VictorBjelkholm/ngProgress 
@@ -23,12 +23,12 @@ angular.module('ngProgress.provider', ['ngProgress.directive'])
                 height = this.height,
                 color = this.color,
                 $scope = $rootScope,
-                $body = $document.find('body');
+                parent = $document.find('body')[0];
 
             // Compile the directive
             var progressbarEl = $compile('<ng-progress></ng-progress>')($scope);
             // Add the element to body
-            $body.append(progressbarEl);
+                parent.appendChild(progressbarEl[0]);
             // Set the initial height
             $scope.count = count;
             // If height or color isn't undefined, set the height, background-color and color.
@@ -158,6 +158,22 @@ angular.module('ngProgress.provider', ['ngProgress.directive'])
                         }, 500);
                     }, 1000);
                     return count;
+                },
+                //set the parent of the directive, sometimes body is not sufficient
+                setParent: function (newParent) {
+                    if (newParent === null || newParent === undefined) {
+                        throw new Error('Provide a valid parent of type HTMLElement');
+                    }
+
+                    if (parent !== null && parent !== undefined) {
+                        parent.removeChild(progressbarEl[0]);
+                    }
+
+                    parent = newParent;
+                    parent.appendChild(progressbarEl[0]);
+                },
+                getDomElement: function () {
+                    return progressbarEl;
                 }
             };
         }];
@@ -166,13 +182,15 @@ angular.module('ngProgress.provider', ['ngProgress.directive'])
             if (color !== undefined) {
                 this.color = color;
             }
+
             return this.color;
         };
 
         this.setHeight = function (height) {
             if (height !== undefined) {
                 this.height = height;
             }
+
             return this.height;
         };
     });

diff --git a/build/ngProgress.min.js b/build/ngProgress.min.js
@@ -1,8 +1,88 @@
 /*
- ngProgress 1.0.5 - slim, site-wide progressbar for AngularJS
+ ngProgress 1.0.6 - slim, site-wide progressbar for AngularJS
 (C) 2013 - Victor Bjelkholm 
 License: MIT 
 Source: https://github.com/VictorBjelkholm/ngProgress 
  Date Compiled: 2014-08-27
 */
-angular.module("ngProgress.provider",["ngProgress.directive"]).provider("ngProgress",function(){"use strict";this.autoStyle=!0,this.count=0,this.height="2px",this.color="firebrick",this.$get=["$document","$window","$compile","$rootScope","$timeout",function(a,b,c,d,e){var f=this.count,g=this.height,h=this.color,i=d,j=a.find("body"),k=c("<ng-progress></ng-progress>")(i);j.append(k),i.count=f,void 0!==g&&k.eq(0).children().css("height",g),void 0!==h&&(k.eq(0).children().css("background-color",h),k.eq(0).children().css("color",h));var l,m=0;return{start:function(){this.show();var a=this;clearInterval(m),m=setInterval(function(){if(isNaN(f))clearInterval(m),f=0,a.hide();else{var b=100-f;f+=.15*Math.pow(1-Math.sqrt(b),2),a.updateCount(f)}},200)},updateCount:function(a){i.count=a,i.$$phase||i.$apply()},height:function(a){return void 0!==a&&(g=a,i.height=g,i.$$phase||i.$apply()),g},color:function(a){return void 0!==a&&(h=a,i.color=h,i.$$phase||i.$apply()),h},hide:function(){k.children().css("opacity","0");var a=this;a.animate(function(){k.children().css("width","0%"),a.animate(function(){a.show()},500)},500)},show:function(){var a=this;a.animate(function(){k.children().css("opacity","1")},100)},animate:function(a,b){l&&e.cancel(l),l=e(a,b)},status:function(){return f},stop:function(){clearInterval(m)},set:function(a){return this.show(),this.updateCount(a),f=a,clearInterval(m),f},css:function(a){return k.children().css(a)},reset:function(){return clearInterval(m),f=0,this.updateCount(f),0},complete:function(){f=100,this.updateCount(f);var a=this;return clearInterval(m),e(function(){a.hide(),e(function(){f=0,a.updateCount(f)},500)},1e3),f}}}],this.setColor=function(a){return void 0!==a&&(this.color=a),this.color},this.setHeight=function(a){return void 0!==a&&(this.height=a),this.height}}),angular.module("ngProgress.directive",[]).directive("ngProgress",["$window","$rootScope",function(a,b){var c={replace:!0,restrict:"E",link:function(a,c){b.$watch("count",function(b){(void 0!==b||null!==b)&&(a.counter=b,c.eq(0).children().css("width",b+"%"))}),b.$watch("color",function(b){(void 0!==b||null!==b)&&(a.color=b,c.eq(0).children().css("background-color",b),c.eq(0).children().css("color",b))}),b.$watch("height",function(b){(void 0!==b||null!==b)&&(a.height=b,c.eq(0).children().css("height",b))})},template:'<div id="ngProgress-container"><div id="ngProgress"></div></div>'};return c}]),angular.module("ngProgress",["ngProgress.directive","ngProgress.provider"]);
+angular.module("ngProgress.provider", ["ngProgress.directive"]).provider("ngProgress", function () {
+    "use strict";
+    this.autoStyle = !0, this.count = 0, this.height = "2px", this.color = "firebrick", this.$get = ["$document", "$window", "$compile", "$rootScope", "$timeout", function (a, b, c, d, e) {
+        var f = this.count, g = this.height, h = this.color, i = d, j = a.find("body")[0], k = c("<ng-progress></ng-progress>")(i);
+        j.appendChild(k[0]), i.count = f, void 0 !== g && k.eq(0).children().css("height", g), void 0 !== h && (k.eq(0).children().css("background-color", h), k.eq(0).children().css("color", h));
+        var l, m = 0;
+        return {
+            start: function () {
+                this.show();
+                var a = this;
+                clearInterval(m), m = setInterval(function () {
+                    if (isNaN(f))clearInterval(m), f = 0, a.hide(); else {
+                        var b = 100 - f;
+                        f += .15 * Math.pow(1 - Math.sqrt(b), 2), a.updateCount(f)
+                    }
+                }, 200)
+            }, updateCount: function (a) {
+                i.count = a, i.$$phase || i.$apply()
+            }, height: function (a) {
+                return void 0 !== a && (g = a, i.height = g, i.$$phase || i.$apply()), g
+            }, color: function (a) {
+                return void 0 !== a && (h = a, i.color = h, i.$$phase || i.$apply()), h
+            }, hide: function () {
+                k.children().css("opacity", "0");
+                var a = this;
+                a.animate(function () {
+                    k.children().css("width", "0%"), a.animate(function () {
+                        a.show()
+                    }, 500)
+                }, 500)
+            }, show: function () {
+                var a = this;
+                a.animate(function () {
+                    k.children().css("opacity", "1")
+                }, 100)
+            }, animate: function (a, b) {
+                l && e.cancel(l), l = e(a, b)
+            }, status: function () {
+                return f
+            }, stop: function () {
+                clearInterval(m)
+            }, set: function (a) {
+                return this.show(), this.updateCount(a), f = a, clearInterval(m), f
+            }, css: function (a) {
+                return k.children().css(a)
+            }, reset: function () {
+                return clearInterval(m), f = 0, this.updateCount(f), 0
+            }, complete: function () {
+                f = 100, this.updateCount(f);
+                var a = this;
+                return clearInterval(m), e(function () {
+                    a.hide(), e(function () {
+                        f = 0, a.updateCount(f)
+                    }, 500)
+                }, 1e3), f
+            }, setParent: function (a) {
+                if (null === a || void 0 === a)throw new Error("Provide a valid parent of type HTMLElement");
+                null !== j && void 0 !== j && j.removeChild(k[0]), j = a, j.appendChild(k[0])
+            }, getDomElement: function () {
+                return k
+            }
+        }
+    }], this.setColor = function (a) {
+        return void 0 !== a && (this.color = a), this.color
+    }, this.setHeight = function (a) {
+        return void 0 !== a && (this.height = a), this.height
+    }
+}), angular.module("ngProgress.directive", []).directive("ngProgress", ["$window", "$rootScope", function (a, b) {
+    var c = {
+        replace: !0, restrict: "E", link: function (a, c) {
+            b.$watch("count", function (b) {
+                (void 0 !== b || null !== b) && (a.counter = b, c.eq(0).children().css("width", b + "%"))
+            }), b.$watch("color", function (b) {
+                (void 0 !== b || null !== b) && (a.color = b, c.eq(0).children().css("background-color", b), c.eq(0).children().css("color", b))
+            }), b.$watch("height", function (b) {
+                (void 0 !== b || null !== b) && (a.height = b, c.eq(0).children().css("height", b))
+            })
+        }, template: '<div id="ngProgress-container"><div id="ngProgress"></div></div>'
+    };
+    return c
+}]), angular.module("ngProgress", ["ngProgress.directive", "ngProgress.provider"]);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngProgress",
-    "version": "1.0.5",
+    "version": "1.0.6",
   "description": "slim, site-wide progressbar for AngularJS",
   "main": "ngProgress.js",
   "repository": {