nprogress-rails 0.1.3.0 → 0.1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 261db801b935edcfac7746e803dab06b69127599
-  data.tar.gz: 3d6c2634d465e766d1de036d54ec22b6899d5fe1
+  metadata.gz: 3e835d33bd6cae627162c79cb68c07f0d883baa7
+  data.tar.gz: 8cafa374c86de5cea8f47a28defe21e9806634a8
 SHA512:
-  metadata.gz: 9f535bce837e0f27a93cb9db21324fc2f7603e1fc4a665edee1708794f1fa8024bd074dde5f02686d014d94c46be5ccc250c0737c415326e2892095045d092b6
-  data.tar.gz: 32e7de0350ca750f49e13d989b4c100a0d1cafe8faf220ac6829272a530ebdce909a21f3b303684fbe51f0f488528ed1125a035567fe2705b698a14814140133
+  metadata.gz: fefa04715b218bca13f31cede920e6b5646d5b746edbcc0b0f2e1485bb296aa68ff7dc9fcbc52a6668183ee138e3487025378402c6aa0b7f12d7c7db568b0896
+  data.tar.gz: 1816fcc91bbef8c8d6638b3ccffdc6feb3118287d0b5e5be971170e0b40f0cd832b7cdb9352ea3fd5f0f6ded980086e7fd81b957c756591c441eb4e7cb433b19

data/README.md

@@ -1,7 +1,7 @@
 # nprogress-rails
 
 This is basically a ruby gem for asset pipeline which includes the version
-0.1.2 of the awesome [rstacruz][rstacruz]' [nprogress][lib] library.
+0.1.6 of the awesome [rstacruz][rstacruz]' [nprogress][lib] library.
 
 - [**Original lib**][lib]
 - [**Demo**][demo]

data/app/assets/javascripts/nprogress.js

@@ -1,20 +1,20 @@
-/*! NProgress (c) 2013, Rico Sta. Cruz
- *  http://ricostacruz.com/nprogress */
+/* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress
+ * @license MIT */
 
-;(function(factory) {
+;(function(root, factory) {
 
-  if (typeof module === 'function') {
-    module.exports = factory();
-  } else if (typeof define === 'function' && define.amd) {
+  if (typeof define === 'function' && define.amd) {
     define(factory);
+  } else if (typeof exports === 'object') {
+    module.exports = factory();
   } else {
-    this.NProgress = factory();
+    root.NProgress = factory();
   }
 
-})(function() {
+})(this, function() {
   var NProgress = {};
 
-  NProgress.version = '0.1.3';
+  NProgress.version = '0.1.6';
 
   var Settings = NProgress.settings = {
     minimum: 0.08,
@@ -27,6 +27,7 @@
     showSpinner: true,
     barSelector: '[role="bar"]',
     spinnerSelector: '[role="spinner"]',
+    parent: 'body',
     template: '<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
   };
 
@@ -82,16 +83,16 @@
 
       if (n === 1) {
         // Fade out
-        css(progress, {
-          transition: 'none',
-          opacity: 1
+        css(progress, { 
+          transition: 'none', 
+          opacity: 1 
         });
         progress.offsetWidth; /* Repaint */
 
         setTimeout(function() {
-          css(progress, {
-            transition: 'all ' + speed + 'ms linear',
-            opacity: 0
+          css(progress, { 
+            transition: 'all ' + speed + 'ms linear', 
+            opacity: 0 
           });
           setTimeout(function() {
             NProgress.remove();
@@ -177,24 +178,24 @@
   /**
    * Waits for all supplied jQuery promises and
    * increases the progress as the promises resolve.
-   *
+   * 
    * @param $promise jQUery Promise
    */
   (function() {
     var initial = 0, current = 0;
-
+    
     NProgress.promise = function($promise) {
       if (!$promise || $promise.state() == "resolved") {
         return this;
       }
-
+      
       if (current == 0) {
         NProgress.start();
       }
-
+      
       initial++;
       current++;
-
+      
       $promise.always(function() {
         current--;
         if (current == 0) {
@@ -204,10 +205,10 @@
             NProgress.set((initial - current) / initial);
         }
       });
-
+      
       return this;
     };
-
+    
   })();
 
   /**
@@ -219,15 +220,16 @@
     if (NProgress.isRendered()) return document.getElementById('nprogress');
 
     addClass(document.documentElement, 'nprogress-busy');
-
+    
     var progress = document.createElement('div');
     progress.id = 'nprogress';
     progress.innerHTML = Settings.template;
 
     var bar      = progress.querySelector(Settings.barSelector),
         perc     = fromStart ? '-100' : toBarPerc(NProgress.status || 0),
+        parent   = document.querySelector(Settings.parent),
         spinner;
-
+    
     css(bar, {
       transition: 'all 0 linear',
       transform: 'translate3d(' + perc + '%,0,0)'
@@ -238,7 +240,11 @@
       spinner && removeElement(spinner);
     }
 
-    document.body.appendChild(progress);
+    if (parent != document.body) {
+      addClass(parent, 'nprogress-custom-parent');
+    }
+
+    parent.appendChild(progress);
     return progress;
   };
 
@@ -248,6 +254,7 @@
 
   NProgress.remove = function() {
     removeClass(document.documentElement, 'nprogress-busy');
+    removeClass(document.querySelector(Settings.parent), 'nprogress-custom-parent')
     var progress = document.getElementById('nprogress');
     progress && removeElement(progress);
   };
@@ -333,7 +340,7 @@
 
   var queue = (function() {
     var pending = [];
-
+    
     function next() {
       var fn = pending.shift();
       if (fn) {
@@ -348,10 +355,10 @@
   })();
 
   /**
-   * (Internal) Applies css properties to an element, similar to the jQuery
+   * (Internal) Applies css properties to an element, similar to the jQuery 
    * css method.
    *
-   * While this helper does assist with vendor prefixed property names, it
+   * While this helper does assist with vendor prefixed property names, it 
    * does not perform any manipulation of values prior to setting styles.
    */
 
@@ -392,7 +399,7 @@
 
     return function(element, properties) {
       var args = arguments,
-          prop,
+          prop, 
           value;
 
       if (args.length == 2) {
@@ -423,7 +430,7 @@
     var oldList = classList(element),
         newList = oldList + name;
 
-    if (hasClass(oldList, name)) return;
+    if (hasClass(oldList, name)) return; 
 
     // Trim the opening space.
     element.className = newList.substring(1);
@@ -447,8 +454,8 @@
   }
 
   /**
-   * (Internal) Gets a space separated list of the class names on the element.
-   * The list is wrapped with a single space on each end to facilitate finding
+   * (Internal) Gets a space separated list of the class names on the element. 
+   * The list is wrapped with a single space on each end to facilitate finding 
    * matches within the list.
    */
 
@@ -465,4 +472,4 @@
   }
 
   return NProgress;
-});
+});

data/app/assets/stylesheets/nprogress.css.scss

@@ -1,4 +1,5 @@
 $nprogress-color: #29d !default;
+$nprogress-zindex: 100 !default;
 
 /* Make clicks pass-through */
 #nprogress {
@@ -9,7 +10,7 @@ $nprogress-color: #29d !default;
   background: $nprogress-color;
 
   position: fixed;
-  z-index: 100;
+  z-index: $nprogress-zindex;
   top: 0;
   left: 0;
 
@@ -36,7 +37,7 @@ $nprogress-color: #29d !default;
 #nprogress .spinner {
   display: block;
   position: fixed;
-  z-index: 100;
+  z-index: $nprogress-zindex;
   top: 15px;
   right: 15px;
 }
@@ -55,6 +56,16 @@ $nprogress-color: #29d !default;
           animation: nprogress-spinner 400ms linear infinite;
 }
 
+.nprogress-custom-parent {
+  overflow: hidden;
+  position: relative;
+}
+
+.nprogress-custom-parent #nprogress .spinner,
+.nprogress-custom-parent #nprogress .bar {
+  position: absolute;
+}
+
 @-webkit-keyframes nprogress-spinner {
   0%   { -webkit-transform: rotate(0deg); }
   100% { -webkit-transform: rotate(360deg); }

data/nprogress-rails.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'nprogress-rails'
-  spec.version       = '0.1.3.0'
+  spec.version       = '0.1.3.1'
   spec.authors       = ['Carlos Alexandro Becker']
   spec.email         = ['caarlos0@gmail.com']
   spec.description   = %q{This is a gem for the rstacruz' nprogress implementation. It's based on version nprogress 0.1.2.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nprogress-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3.0
+  version: 0.1.3.1
 platform: ruby
 authors:
 - Carlos Alexandro Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler