Skip to content

Commit 3844527

Browse files
committed
Merge branch 'vanilla'
2 parents 9d05e27 + f220468 commit 3844527

File tree

192 files changed

+3676
-4929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+3676
-4929
lines changed

.gitmodules

Lines changed: 0 additions & 6 deletions
This file was deleted.

Gruntfile.js

Lines changed: 13 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,29 @@ module.exports = function(grunt) {
44
'<%= grunt.template.today("yyyy-mm-dd HH:MM:ss") %> */' +
55
'\n\n';
66

7-
function getFiles ( append ) {
7+
function getFiles ( ) {
88

9-
var files = [
10-
'src/js/helpers/intro.js',
9+
return [
10+
'src/js/intro.js',
1111
'src/js/helpers.js',
1212
'src/js/constants.js',
1313
'src/js/range.js',
1414
'src/js/options.js',
1515
'src/js/structure.js',
1616
'src/js/scope_start.js',
17+
'src/js/pips.js',
1718
'src/js/scope_helpers.js',
18-
'src/js/scope_link.js',
1919
'src/js/scope_events.js',
2020
'src/js/scope.js',
2121
'src/js/scope_end.js',
22-
'src/js/interface.js'
22+
'src/js/interface.js',
23+
'src/js/outro.js'
2324
];
24-
25-
if ( append ) {
26-
files = files.concat(append);
27-
}
28-
29-
files.push('src/js/helpers/outro.js');
30-
31-
return files;
3225
}
3326

3427
var releaseFiles = [
3528
{ src: ['**/*'], dest: '', cwd: 'distribute/', expand: true },
36-
{ src: ['**/*.css'], dest: '', cwd: 'src/', expand: true },
37-
{ src: ['**/archive.md'], rename: function(){ return 'README.md'; }, dest: '', cwd: 'src/', expand: true }
29+
{ src: ['**/*.css'], dest: '', cwd: 'src/', expand: true }
3830
];
3931

4032
grunt.initConfig({
@@ -45,36 +37,17 @@ module.exports = function(grunt) {
4537
},
4638
basic: {
4739
src: getFiles(),
48-
dest: 'distribute/jquery.nouislider.js',
40+
dest: 'distribute/nouislider.js',
4941
nonull: true
50-
},
51-
all: {
52-
src: ['submodules/wNumb/wNumb.js', 'submodules/libLink/jquery.libLink.js'].concat(getFiles('src/js/pips.js')),
53-
dest: 'distribute/jquery.nouislider.all.js',
54-
nonull: true
55-
},
42+
}
5643
},
5744
cssmin: {
5845
all: {
5946
options: {
6047
banner: VERSION_TEMPLATE
6148
},
6249
files: {
63-
'distribute/jquery.nouislider.min.css': ['src/jquery.nouislider.css'],
64-
'distribute/jquery.nouislider.pips.min.css': ['src/jquery.nouislider.pips.css']
65-
}
66-
}
67-
},
68-
'string-replace': {
69-
version: {
70-
files: {
71-
'nouislider.jquery.json': 'src/jquery.json'
72-
},
73-
options: {
74-
replacements: [{
75-
pattern: /{{VERSION}}/g,
76-
replacement: '<%= pkg.version %>'
77-
}]
50+
'distribute/nouislider.min.css': ['src/nouislider.css', 'src/nouislider.pips.css']
7851
}
7952
}
8053
},
@@ -87,17 +60,15 @@ module.exports = function(grunt) {
8760
validthis: true,
8861
newcap: false
8962
},
90-
basic: ['distribute/jquery.nouislider.js'],
91-
all: ['distribute/jquery.nouislider.all.js']
63+
basic: ['distribute/nouislider.js']
9264
},
9365
uglify: {
9466
all: {
9567
options: {
9668
banner: VERSION_TEMPLATE
9769
},
9870
files: {
99-
'distribute/jquery.nouislider.min.js': 'distribute/jquery.nouislider.js',
100-
'distribute/jquery.nouislider.all.min.js': 'distribute/jquery.nouislider.all.js'
71+
'distribute/nouislider.min.js': 'distribute/nouislider.js'
10172
}
10273
}
10374
},
@@ -120,9 +91,6 @@ module.exports = function(grunt) {
12091
// https://github.com/gruntjs/grunt-contrib-jshint
12192
grunt.loadNpmTasks('grunt-contrib-jshint');
12293

123-
// https://github.com/erickrdch/grunt-string-replace
124-
grunt.loadNpmTasks('grunt-string-replace');
125-
12694
// https://github.com/gruntjs/grunt-contrib-cssmin
12795
grunt.loadNpmTasks('grunt-contrib-cssmin');
12896

@@ -131,5 +99,5 @@ module.exports = function(grunt) {
13199

132100
grunt.registerTask('default', ['concat', 'jshint']);
133101
grunt.registerTask('create', ['concat', 'jshint', 'uglify', 'cssmin']);
134-
grunt.registerTask('release', ['string-replace', 'compress']);
102+
grunt.registerTask('release', ['compress']);
135103
};

README.md

Lines changed: 26 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# noUiSlider
22

3-
noUiSlider is lightweight plugin, developed to be a jQuery UI alternative. It features cross-browser support, a `just-another-input-type` style of getting and setting values, a wide range of options and support for a bunch of touch devices. It works wonders on Android phones, iPhone & iPad, Windows phone and touch-screen laptops and tablets. It works excellent on the desktop too; All modern browsers and IE7+ are supported. The end result? A lean, extendible and bloat-less plugin that'll just do its job. To add even more flexibility, noUiSlider is compatible with both jQuery and Zepto.js. Oh, and the licensing terms are simple: [just do what you want](http://www.wtfpl.net/about/).
3+
noUiSlider is lightweight JavaScript range slider, originally developed to be a jQuery UI alternative. It features cross-browser support, a wide range of options and support for a bunch of touch devices. It has been tested on Android phones, iPhone & iPad, Windows phone and touch-screen laptops and tablets and desktops; All modern browsers and IE9+ are supported. The end result? A lean, extendible and bloat-less plugin that'll just do its job.
4+
5+
The best part? noUiSlider has no dependencies! As of version 8, **Query is no longer required!**
6+
7+
Oh, and the licensing terms are simple: [just do what you want](http://www.wtfpl.net/about/).
48

59
Documentation
610
-------
@@ -12,48 +16,27 @@ Bower users can install all compiled and minified files easily using `bower inst
1216

1317
Changelog
1418
---------
15-
###7.0.10
16-
+ Fixed an issue where calling `.val(undefined)` wouldn't match specification (#383);
17-
+ Values in `range` are now properly sorted before being used (and can thus be passed in any order) (#393);
18-
+ Fixed an error in `.noUiSlider('step')` where JS floating point precision would mess up a comparison (#391);
19-
+ Fixed the slider styles failing when CSS `direction: rtl` is set (#275, #377);
20-
+ Fixed throwing an error when running `.noUiSlider` on an empty selection (#325);
21-
+ Fixed the filter function for the pips plugin not always being called (#365);
22-
23-
###7.0.9
24-
+ Fixed an issue when using the pips plugin with sliders not starting at `0`. (#357)
25-
26-
###7.0.8
27-
+ Fixed an issue in the way the `$.fn.val` method is overridden. (#350)
28-
29-
###7.0.4 ~ 7.0.7
30-
+ Bower support.
31-
32-
###7.0.3:
33-
+ Fixed an issue with Link on single-handle RTL sliders.
34-
35-
###7.0.2:
36-
+ Fixed an issue with the handle `z-index`. (#333)
37-
+ Added pips formatting. (#330)
38-
+ Added Grunt-based tasks.
39-
40-
###7.x
41-
noUiSlider is currently on version 7. This version contains significant changes from 6, improving various aspects and moving some features in their own module.
42-
+ All serialization features are now supported by my new project, [libLink](http://refreshless.com/liblink/).
43-
+ All number formatting features have been moved into the [wNumb formatting library](http://refreshless.com/wnumb/).
44-
+ The val method now only takes values, as all additional options are now automaticly detected.
45-
+ Documentation overhaul
46-
+ Improved and restructured testing suite.
47-
+ Performance improvements due to painting in another layer. (#268);
48-
+ Minified file is now clearly marked (#320).
49-
+ Added `limit` option to provide 'maximum margin' (#308).
50-
+ Fixed rebuilding an uninitialized slider (#271).
51-
+ Added generation of pips/range points (#254, #260).
52-
+ Fixed `tap` ignoring `margin` (#265).
53-
54-
Unit Testing
55-
------------
56-
Unit tests where overhauled for noUiSlider 7. Most code is now covered, with events testing being slightly lacking due to it's browser dependant nature.
19+
###8.0.0
20+
Remove jQuery dependency! For more info and other changes, see [the release information](http://refreshless.com/nouislider/new-version).
21+
22+
Browserify
23+
----------
24+
This library is [UMD](https://github.com/umdjs/umd) compatible, so you can use it in this way:
25+
26+
```javascript
27+
require('nouislider');
28+
29+
var slider = document.getElementById('slider');
30+
31+
noUiSlider.create(slider, {
32+
start: 40,
33+
connect: "lower",
34+
range: {
35+
min: 0,
36+
max: 100
37+
}
38+
});
39+
```
5740

5841
Version numbering
5942
------------------------------

bower.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "nouislider",
33
"description": "A lightweight, highly customizable range slider without bloat. Touch support on all modern devices and responsive design ready!",
44
"keywords": [
5-
"jquery",
65
"slider",
76
"form",
87
"range",
@@ -12,13 +11,9 @@
1211
"slide"
1312
],
1413
"main": [
15-
"distribute/jquery.nouislider.all.min.js",
16-
"distribute/jquery.nouislider.min.css",
17-
"distribute/jquery.nouislider.pips.min.css"
14+
"distribute/nouislider.js",
15+
"distribute/nouislider.min.css",
1816
],
19-
"dependencies": {
20-
"jquery": ">= 1.7.0"
21-
},
2217
"ignore": [
2318
"**/.*",
2419
"**/*.json"

0 commit comments

Comments
 (0)