nprogress_rails 0.1.0.1 → 0.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84be57f17dc2341dfa51d86c4dc318d01b005145
-  data.tar.gz: 3e640f92d36d4f1356a6b344c21bb6c9078c91a0
+  metadata.gz: 90012fead4389decea774de668482c6c8d09751d
+  data.tar.gz: 34641e2c231a1337c417605d071a4b3dca332f53
 SHA512:
-  metadata.gz: 06ed4c714b89cd26049e893f909b58d26d0706bd4b6ec39c458d9f8b256504ab2c5cc586f869cac5e6f0096d14b4d7edddc77d5625381d253418fc067bafdcf6
-  data.tar.gz: 75875506f989870b898ed220a0452588b55ddc172074f10e40455eecc34992cc07d4e79bd0e7fc012b9ed32ad3de1fb11d3b7d0ba2c6a91d9367c28a7e103777
+  metadata.gz: a2fbd3de15e8ab3446352da9cdcbcb4b59ff0522c7f59898c388a37a9316019d5babbb62a38de25a9b3f601f34abfad8f10b196a6383d46d5f8cf36cefbaec42
+  data.tar.gz: aeea024a72ecb7ddb8b364645a2c75115ed7f9e9e675ff4453020505becf1cd17629e45469072eb7241c860a376aeb16a0307489f8747a039bcd38f835746796

data/README.md

@@ -1,8 +1,15 @@
 # nprogress_rails
 
 This is basically a ruby gem for asset pipeline which includes the version
-0.1.0 of the awesome rstacruz' [nprogress](https://github.com/rstacruz/nprogress)
-library.
+0.1.0 of the awesome [rstacruz][rstacruz]' [nprogress][lib] library.
+
+- [**Original lib**][lib]
+- [**Demo**][demo]
+
+
+[rstacruz]: https://github.com/rstacruz
+[lib]: https://github.com/rstacruz/nprogress
+[demo]: http://ricostacruz.com/nprogress/
 
 ## Installation
 

data/nprogress_rails.gemspec

@@ -4,12 +4,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "nprogress_rails"
-  spec.version       = "0.1.0.1"
+  spec.version       = "0.1.1.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.0.}
   spec.summary       = %q{Slim progress bars for Ajax'y applications. Inspired by Google, YouTube, and Medium.}
-  spec.homepage      = "http://carlosbecker.com/about"
+  spec.homepage      = "https://github.com/caarlos0/nprogress_rails"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/vendor/assets/javascripts/nprogress.js

@@ -12,16 +12,18 @@
 })(function($) {
   var NProgress = {};
 
-  NProgress.version = '0.1.0';
+  NProgress.version = '0.1.1';
 
   var Settings = NProgress.settings = {
     minimum: 0.08,
     easing: 'ease',
+    positionUsing: '',
     speed: 200,
     trickle: true,
     trickleRate: 0.02,
     trickleSpeed: 800,
-    template: '<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner"><div class="spinner-icon"></div></div>'
+    showSpinner: true,
+    template: '<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
   };
 
   /**
@@ -63,10 +65,11 @@
     $progress[0].offsetWidth; /* Repaint */
 
     $progress.queue(function(next) {
-      $bar.css({
-        transition: 'all '+speed+'ms '+ease,
-        transform: 'translate3d('+toBarPerc(n)+'%,0,0)'
-      });
+      // Set positionUsing if it hasn't already been set
+      if (Settings.positionUsing === '') Settings.positionUsing = NProgress.getPositioningCSS();
+      
+      // Add transition
+      $bar.css(barPositionCSS(n, speed, ease));
 
       if (n === 1) {
         // Fade out
@@ -175,13 +178,16 @@
       transform: 'translate3d('+perc+'%,0,0)'
     });
 
+    if (!Settings.showSpinner)
+      $el.find('[role="spinner"]').remove();
+
     $el.appendTo(document.body);
 
     return $el;
   };
 
   /**
-   * (Internal) Removes the element. Opposite of render().
+   * Removes the element. Opposite of render().
    */
 
   NProgress.remove = function() {
@@ -197,6 +203,32 @@
     return ($("#nprogress").length > 0);
   };
 
+  /**
+   * Determine which positioning CSS rule to use.
+   */
+
+  NProgress.getPositioningCSS = function() {
+    // Sniff on document.body.style
+    var bodyStyle = document.body.style;
+
+    // Sniff prefixes
+    var vendorPrefix = ('WebkitTransform' in bodyStyle) ? 'Webkit' :
+                       ('MozTransform' in bodyStyle) ? 'Moz' :
+                       ('msTransform' in bodyStyle) ? 'ms' :
+                       ('OTransform' in bodyStyle) ? 'O' : '';
+
+    if (vendorPrefix + 'Perspective' in bodyStyle) {
+      // Modern browsers with 3D support, e.g. Webkit, IE10
+      return 'translate3d';
+    } else if (vendorPrefix + 'Transform' in bodyStyle) {
+      // Browsers without 3D support, e.g. IE9
+      return 'translate';
+    } else {
+      // Browsers without translate() support, e.g. IE7-8
+      return 'margin';
+    }
+  };
+
   /**
    * Helpers
    */
@@ -216,5 +248,27 @@
     return (-1 + n) * 100;
   }
 
+
+  /**
+   * (Internal) returns the correct CSS for changing the bar's
+   * position given an n percentage, and speed and ease from Settings
+   */
+
+  function barPositionCSS(n, speed, ease) {
+    var barCSS;
+
+    if (Settings.positionUsing === 'translate3d') {
+      barCSS = { transform: 'translate3d('+toBarPerc(n)+'%,0,0)' };
+    } else if (Settings.positionUsing === 'translate') {
+      barCSS = { transform: 'translate('+toBarPerc(n)+'%,0)' };
+    } else {
+      barCSS = { 'margin-left': toBarPerc(n)+'%' };
+    }
+
+    barCSS.transition = 'all '+speed+'ms '+ease;
+
+    return barCSS;
+  }
+
   return NProgress;
 });

data/vendor/assets/javascripts/nprogress_turbolinks.js

@@ -1,4 +1,5 @@
 $(function() {
-  $(document).on('page:fetch', function() { NProgress.start(); });
-  $(document).on('page:load',  function() { NProgress.done(); });
+  $(document).on('page:fetch',   function() { NProgress.start();  });
+  $(document).on('page:change',  function() { NProgress.done();   });
+  $(document).on('page:restore', function() { NProgress.remove(); });
 });

data/vendor/assets/stylesheets/nprogress.css

@@ -4,11 +4,6 @@
   -webkit-pointer-events: none;
 }
 
-/* Make the entire page show a busy cursor */
-.nprogress-busy body {
-  cursor: wait;
-}
-
 #nprogress .bar {
   background: #29d;
 

data/vendor/assets/stylesheets/nprogress_bootstrap.css

@@ -1,3 +1,4 @@
-#nprogress .bar {
+#nprogress .bar,
+#nprogress .spinner {
   z-index: 999999;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nprogress_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0.1
+  version: 0.1.1.1
 platform: ruby
 authors:
 - Carlos Alexandro Becker
@@ -57,7 +57,7 @@ files:
 - vendor/assets/javascripts/nprogress_turbolinks.js
 - vendor/assets/stylesheets/nprogress.css
 - vendor/assets/stylesheets/nprogress_bootstrap.css
-homepage: http://carlosbecker.com/about
+homepage: https://github.com/caarlos0/nprogress_rails
 licenses:
 - MIT
 metadata: {}
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Slim progress bars for Ajax'y applications. Inspired by Google, YouTube,