glider-rails 0.1.4.2 → 0.1.4.3

data/app/assets/javascripts/glider.coffee

@@ -1,5 +1,5 @@
 ###
-  glider 0.1.4.2 - AngularJS slider
+  glider 0.1.4.3 - AngularJS slider
   https://github.com/evrone/glider
   Copyright (c) 2013 Valentin Vasilyev, Dmitry Karpunin
   Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
@@ -57,6 +57,9 @@ gliderModule.directive 'slider', ['$document', ($document) ->
 
   link: (scope, element, attrs) ->
 
+    bound = (value, min, max) ->
+      Math.min(Math.max(min, value), max)
+
     parseIncrements = ->
       return unless attrs.increments?
       min = scope.min()
@@ -87,7 +90,7 @@ gliderModule.directive 'slider', ['$document', ($document) ->
         scope.xPosition = 0
       else
         scope.xPosition = (scope.value - scope.min()) / range * 100
-        scope.xPosition = Math.min(Math.max(0, scope.xPosition), 100)
+        scope.xPosition = bound(scope.xPosition, 0, 100)
       scope.handleValue = scope.value if scope.showValueInHandle
 
     snap = ->
@@ -119,7 +122,7 @@ gliderModule.directive 'slider', ['$document', ($document) ->
       if scope.min() <= newVal <= scope.max()
         refreshHandle()
       else
-        newVal = oldVal
+        scope.value = bound(newVal, scope.min(), scope.max())
 
     scope.step = (steps) ->
       doStep = (steps)->

data/app/assets/javascripts/glider.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 1.6.3
 /*
-  glider 0.1.4.2 - AngularJS slider
+  glider 0.1.4.3 - AngularJS slider
   https://github.com/evrone/glider
   Copyright (c) 2013 Valentin Vasilyev, Dmitry Karpunin
   Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
@@ -39,7 +39,10 @@
           max: "&"
         },
         link: function(scope, element, attrs) {
-          var deferUpdate, dragging, parseIncrements, refreshHandle, sliderElement, snap, startPointX, step, valueFromPosition;
+          var bound, deferUpdate, dragging, parseIncrements, refreshHandle, sliderElement, snap, startPointX, step, valueFromPosition;
+          bound = function(value, min, max) {
+            return Math.min(Math.max(min, value), max);
+          };
           parseIncrements = function() {
             var i, max, min, offsetK, _i, _len, _ref;
             if (attrs.increments == null) {
@@ -85,7 +88,7 @@
               scope.xPosition = 0;
             } else {
               scope.xPosition = (scope.value - scope.min()) / range * 100;
-              scope.xPosition = Math.min(Math.max(0, scope.xPosition), 100);
+              scope.xPosition = bound(scope.xPosition, 0, 100);
             }
             if (scope.showValueInHandle) {
               return scope.handleValue = scope.value;
@@ -134,7 +137,7 @@
             if ((scope.min() <= newVal && newVal <= scope.max())) {
               return refreshHandle();
             } else {
-              return newVal = oldVal;
+              return scope.value = bound(newVal, scope.min(), scope.max());
             }
           });
           scope.step = function(steps) {
@@ -255,3 +258,7 @@
   });
 
 }).call(this);
+
+/*
+//@ sourceMappingURL=glider.map
+*/

data/glider-rails.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "glider-rails"
-  gem.version       = "0.1.4.2"
+  gem.version       = "0.1.4.3"
   gem.authors       = ["Valentin Valve Vasilyev", "Dmitry KODer Karpunin"]
   gem.email         = ["iamvalentin@gmail.com", "koderfunk@gmail.com"]
   gem.description   = "Glider, AngularJS UI slider for rails asset pipeline"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glider-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4.2
+  version: 0.1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies: []
 description: Glider, AngularJS UI slider for rails asset pipeline
 email: