Merge pull request #170 from assisrafael/master

Changes all instances of $animate.enter() to follow angular 1.3.x semantics without breaking 1.2.x
chieffancypants · Feb 17, 2015 · 7ce8a1f · 7ce8a1f
2 parents 25f7e26 + 718d25c
commit 7ce8a1f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/build/loading-bar.css b/build/loading-bar.css
@@ -1,7 +1,7 @@
 /*! 
  * angular-loading-bar v0.6.0
  * https://chieffancypants.github.io/angular-loading-bar
- * Copyright (c) 2014 Wes Cruver
+ * Copyright (c) 2015 Wes Cruver
  * License: MIT
  */
 

diff --git a/build/loading-bar.js b/build/loading-bar.js
@@ -1,7 +1,7 @@
 /*! 
  * angular-loading-bar v0.6.0
  * https://chieffancypants.github.io/angular-loading-bar
- * Copyright (c) 2014 Wes Cruver
+ * Copyright (c) 2015 Wes Cruver
  * License: MIT
  */
 /*
@@ -200,11 +200,11 @@ angular.module('cfp.loadingBar', [])
         started = true;
 
         if (includeBar) {
-          $animate.enter(loadingBarContainer, $parent);
+          $animate.enter(loadingBarContainer, $parent, angular.element($parent[0].lastChild));
         }
 
         if (includeSpinner) {
-          $animate.enter(spinner, $parent);
+          $animate.enter(spinner, $parent, angular.element($parent[0].lastChild));
         }
 
         _set(startSize);

diff --git a/build/loading-bar.min.css b/build/loading-bar.min.css
diff --git a/build/loading-bar.min.js b/build/loading-bar.min.js
diff --git a/src/loading-bar.js b/src/loading-bar.js
@@ -197,11 +197,11 @@ angular.module('cfp.loadingBar', [])
         started = true;
 
         if (includeBar) {
-          $animate.enter(loadingBarContainer, $parent);
+          $animate.enter(loadingBarContainer, $parent, angular.element($parent[0].lastChild));
         }
 
         if (includeSpinner) {
-          $animate.enter(spinner, $parent);
+          $animate.enter(spinner, $parent, angular.element($parent[0].lastChild));
         }
 
         _set(startSize);

diff --git a/test/loading-bar-interceptor.coffee b/test/loading-bar-interceptor.coffee
@@ -212,6 +212,22 @@ describe 'loadingBarInterceptor Service', ->
     $httpBackend.flush()
     $timeout.flush()
 
+  it 'should insert the loadingbar as the last children of the parent container', inject (cfpLoadingBar) ->
+    $httpBackend.expectGET(endpoint).respond response
+    $httpBackend.expectGET(endpoint).respond response
+    $http.get(endpoint)
+    $http.get(endpoint)
+
+    $httpBackend.flush(1)
+    $timeout.flush() # flush the latencyThreshold timeout
+
+    parent = $document.find(cfpLoadingBar.parentSelector)[0]
+    children = parent.childNodes
+    expect(children[children.length - 1].id).toBe 'loading-bar-spinner'
+    expect(children[children.length - 2].id).toBe 'loading-bar'
+
+    $httpBackend.flush()
+    $timeout.flush()
 
   it 'should remove the loading bar when all requests have been received', inject (cfpLoadingBar) ->
     $httpBackend.expectGET(endpoint).respond response