Merge branch 'pace-progress-and-big-counter' of github.com:HubSpot/pace

Conflicts: pace.min.js
nickgoh · Oct 4, 2013 · 423cd4d · 423cd4d
2 parents 5fe60d0 + 0ab2fb7
commit 423cd4d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/pace.coffee b/pace.coffee
@@ -189,8 +189,8 @@ class Bar
 
     if not @lastRenderedProgress or @lastRenderedProgress|0 != @progress|0
       # The whole-part of the number has changed
-      
-      el.setAttribute 'data-progress-text', "#{ @progress|0 }%"
+
+      el.children[0].setAttribute 'data-progress-text', "#{ @progress|0 }%"
 
       if @progress >= 100
         # We cap it at 99 so we can use prefix-based attribute selectors
@@ -199,7 +199,7 @@ class Bar
         progressStr = if @progress < 10 then "0" else ""
         progressStr += @progress|0
 
-      el.setAttribute 'data-progress', "#{ progressStr }"
+      el.children[0].setAttribute 'data-progress', "#{ progressStr }"
 
     @lastRenderedProgress = @progress
 

diff --git a/pace.js b/pace.js