Skip to content
This repository has been archived by the owner on May 30, 2024. It is now read-only.

Commit

Permalink
Merge pull request #167 from andreruffert/release/v1.3.3
Browse files Browse the repository at this point in the history
release: v1.3.3
  • Loading branch information
andreruffert committed Aug 13, 2015
2 parents 9a00d8d + cc1a355 commit 508a1c5
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 34 deletions.
11 changes: 0 additions & 11 deletions .npmignore

This file was deleted.

2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rangeslider.js",
"version": "1.3.2",
"version": "1.3.3",
"homepage": "https://github.com/andreruffert/rangeslider.js",
"authors": [
"André Ruffert <[email protected]>"
Expand Down
8 changes: 4 additions & 4 deletions dist/rangeslider.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! rangeslider.js - v1.3.2 | (c) 2015 @andreruffert | MIT license | https://github.com/andreruffert/rangeslider.js */
/*! rangeslider.js - v1.3.3 | (c) 2015 @andreruffert | MIT license | https://github.com/andreruffert/rangeslider.js */
(function(factory) {
'use strict';

Expand Down Expand Up @@ -278,7 +278,7 @@
this.$range.removeClass(this.options.disabledClass);
}

this.setPosition(this.position);
this.setPosition(this.position, false);
};

Plugin.prototype.handleDown = function(e) {
Expand Down Expand Up @@ -327,7 +327,7 @@
return pos;
};

Plugin.prototype.setPosition = function(pos) {
Plugin.prototype.setPosition = function(pos, callCb) {
var value, left;

// Snapping steps
Expand All @@ -343,7 +343,7 @@
this.position = left;
this.value = value;

if (this.onSlide && typeof this.onSlide === 'function') {
if (this.onSlide && typeof this.onSlide === 'function' && typeof callCb === 'undefined') {
this.onSlide(left, value);
}
};
Expand Down
4 changes: 2 additions & 2 deletions dist/rangeslider.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 16 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "rangeslider.js",
"title": "rangeslider.js",
"description": "Simple, small and fast JavaScript/jQuery polyfill for the HTML5 <input type=\"range\"> slider element",
"version": "1.3.2",
"codename": "Cotton Candy",
"version": "1.3.3",
"codename": "Fuzzy Wuzzy",
"main": "dist/rangeslider.js",
"homepage": "https://github.com/andreruffert/rangeslider.js",
"author": {
Expand Down Expand Up @@ -37,18 +37,21 @@
"dependencies": {},
"devDependencies": {
"crayola": "0.0.1",
"grunt": "~0.4.2",
"grunt-bump": "0.0.15",
"grunt-contrib-compass": "~0.7.0",
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-jshint": "~0.8.0",
"grunt-contrib-uglify": "~0.2.7",
"grunt-contrib-watch": "~0.5.2",
"jshint-stylish": "~0.1.5",
"load-grunt-tasks": "~0.2.1",
"time-grunt": "~0.2.7"
"grunt": "~0.4.5",
"grunt-bump": "0.3.1",
"grunt-contrib-compass": "~1.0.3",
"grunt-contrib-concat": "~0.5.1",
"grunt-contrib-jshint": "~0.11.2",
"grunt-contrib-uglify": "~0.9.1",
"grunt-contrib-watch": "~0.6.1",
"jshint-stylish": "~2.0.1",
"load-grunt-tasks": "~3.2.0",
"time-grunt": "~1.2.1"
},
"scripts": {
"test": "grunt jshint"
}
},
"files": [
"dist"
]
}
6 changes: 3 additions & 3 deletions src/rangeslider.js
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
this.$range.removeClass(this.options.disabledClass);
}

this.setPosition(this.position);
this.setPosition(this.position, false);
};

Plugin.prototype.handleDown = function(e) {
Expand Down Expand Up @@ -326,7 +326,7 @@
return pos;
};

Plugin.prototype.setPosition = function(pos) {
Plugin.prototype.setPosition = function(pos, callCb) {
var value, left;

// Snapping steps
Expand All @@ -342,7 +342,7 @@
this.position = left;
this.value = value;

if (this.onSlide && typeof this.onSlide === 'function') {
if (this.onSlide && typeof this.onSlide === 'function' && typeof callCb === 'undefined') {
this.onSlide(left, value);
}
};
Expand Down

0 comments on commit 508a1c5

Please sign in to comment.