Skip to content

Commit

Permalink
Merge branch 'vanilla'
Browse files Browse the repository at this point in the history
  • Loading branch information
leongersen committed Jun 29, 2015
2 parents 9d05e27 + f220468 commit 3844527
Show file tree
Hide file tree
Showing 192 changed files with 3,676 additions and 4,929 deletions.
6 changes: 0 additions & 6 deletions .gitmodules

This file was deleted.

58 changes: 13 additions & 45 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,29 @@ module.exports = function(grunt) {
'<%= grunt.template.today("yyyy-mm-dd HH:MM:ss") %> */' +
'\n\n';

function getFiles ( append ) {
function getFiles ( ) {

var files = [
'src/js/helpers/intro.js',
return [
'src/js/intro.js',
'src/js/helpers.js',
'src/js/constants.js',
'src/js/range.js',
'src/js/options.js',
'src/js/structure.js',
'src/js/scope_start.js',
'src/js/pips.js',
'src/js/scope_helpers.js',
'src/js/scope_link.js',
'src/js/scope_events.js',
'src/js/scope.js',
'src/js/scope_end.js',
'src/js/interface.js'
'src/js/interface.js',
'src/js/outro.js'
];

if ( append ) {
files = files.concat(append);
}

files.push('src/js/helpers/outro.js');

return files;
}

var releaseFiles = [
{ src: ['**/*'], dest: '', cwd: 'distribute/', expand: true },
{ src: ['**/*.css'], dest: '', cwd: 'src/', expand: true },
{ src: ['**/archive.md'], rename: function(){ return 'README.md'; }, dest: '', cwd: 'src/', expand: true }
{ src: ['**/*.css'], dest: '', cwd: 'src/', expand: true }
];

grunt.initConfig({
Expand All @@ -45,36 +37,17 @@ module.exports = function(grunt) {
},
basic: {
src: getFiles(),
dest: 'distribute/jquery.nouislider.js',
dest: 'distribute/nouislider.js',
nonull: true
},
all: {
src: ['submodules/wNumb/wNumb.js', 'submodules/libLink/jquery.libLink.js'].concat(getFiles('src/js/pips.js')),
dest: 'distribute/jquery.nouislider.all.js',
nonull: true
},
}
},
cssmin: {
all: {
options: {
banner: VERSION_TEMPLATE
},
files: {
'distribute/jquery.nouislider.min.css': ['src/jquery.nouislider.css'],
'distribute/jquery.nouislider.pips.min.css': ['src/jquery.nouislider.pips.css']
}
}
},
'string-replace': {
version: {
files: {
'nouislider.jquery.json': 'src/jquery.json'
},
options: {
replacements: [{
pattern: /{{VERSION}}/g,
replacement: '<%= pkg.version %>'
}]
'distribute/nouislider.min.css': ['src/nouislider.css', 'src/nouislider.pips.css']
}
}
},
Expand All @@ -87,17 +60,15 @@ module.exports = function(grunt) {
validthis: true,
newcap: false
},
basic: ['distribute/jquery.nouislider.js'],
all: ['distribute/jquery.nouislider.all.js']
basic: ['distribute/nouislider.js']
},
uglify: {
all: {
options: {
banner: VERSION_TEMPLATE
},
files: {
'distribute/jquery.nouislider.min.js': 'distribute/jquery.nouislider.js',
'distribute/jquery.nouislider.all.min.js': 'distribute/jquery.nouislider.all.js'
'distribute/nouislider.min.js': 'distribute/nouislider.js'
}
}
},
Expand All @@ -120,9 +91,6 @@ module.exports = function(grunt) {
// https://github.com/gruntjs/grunt-contrib-jshint
grunt.loadNpmTasks('grunt-contrib-jshint');

// https://github.com/erickrdch/grunt-string-replace
grunt.loadNpmTasks('grunt-string-replace');

// https://github.com/gruntjs/grunt-contrib-cssmin
grunt.loadNpmTasks('grunt-contrib-cssmin');

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

grunt.registerTask('default', ['concat', 'jshint']);
grunt.registerTask('create', ['concat', 'jshint', 'uglify', 'cssmin']);
grunt.registerTask('release', ['string-replace', 'compress']);
grunt.registerTask('release', ['compress']);
};
69 changes: 26 additions & 43 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# noUiSlider

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/).
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.

The best part? noUiSlider has no dependencies! As of version 8, **Query is no longer required!**

Oh, and the licensing terms are simple: [just do what you want](http://www.wtfpl.net/about/).

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

Changelog
---------
###7.0.10
+ Fixed an issue where calling `.val(undefined)` wouldn't match specification (#383);
+ Values in `range` are now properly sorted before being used (and can thus be passed in any order) (#393);
+ Fixed an error in `.noUiSlider('step')` where JS floating point precision would mess up a comparison (#391);
+ Fixed the slider styles failing when CSS `direction: rtl` is set (#275, #377);
+ Fixed throwing an error when running `.noUiSlider` on an empty selection (#325);
+ Fixed the filter function for the pips plugin not always being called (#365);

###7.0.9
+ Fixed an issue when using the pips plugin with sliders not starting at `0`. (#357)

###7.0.8
+ Fixed an issue in the way the `$.fn.val` method is overridden. (#350)

###7.0.4 ~ 7.0.7
+ Bower support.

###7.0.3:
+ Fixed an issue with Link on single-handle RTL sliders.

###7.0.2:
+ Fixed an issue with the handle `z-index`. (#333)
+ Added pips formatting. (#330)
+ Added Grunt-based tasks.

###7.x
noUiSlider is currently on version 7. This version contains significant changes from 6, improving various aspects and moving some features in their own module.
+ All serialization features are now supported by my new project, [libLink](http://refreshless.com/liblink/).
+ All number formatting features have been moved into the [wNumb formatting library](http://refreshless.com/wnumb/).
+ The val method now only takes values, as all additional options are now automaticly detected.
+ Documentation overhaul
+ Improved and restructured testing suite.
+ Performance improvements due to painting in another layer. (#268);
+ Minified file is now clearly marked (#320).
+ Added `limit` option to provide 'maximum margin' (#308).
+ Fixed rebuilding an uninitialized slider (#271).
+ Added generation of pips/range points (#254, #260).
+ Fixed `tap` ignoring `margin` (#265).

Unit Testing
------------
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.
###8.0.0
Remove jQuery dependency! For more info and other changes, see [the release information](http://refreshless.com/nouislider/new-version).

Browserify
----------
This library is [UMD](https://github.com/umdjs/umd) compatible, so you can use it in this way:

```javascript
require('nouislider');

var slider = document.getElementById('slider');

noUiSlider.create(slider, {
start: 40,
connect: "lower",
range: {
min: 0,
max: 100
}
});
```

Version numbering
------------------------------
Expand Down
9 changes: 2 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "nouislider",
"description": "A lightweight, highly customizable range slider without bloat. Touch support on all modern devices and responsive design ready!",
"keywords": [
"jquery",
"slider",
"form",
"range",
Expand All @@ -12,13 +11,9 @@
"slide"
],
"main": [
"distribute/jquery.nouislider.all.min.js",
"distribute/jquery.nouislider.min.css",
"distribute/jquery.nouislider.pips.min.css"
"distribute/nouislider.js",
"distribute/nouislider.min.css",
],
"dependencies": {
"jquery": ">= 1.7.0"
},
"ignore": [
"**/.*",
"**/*.json"
Expand Down
Loading

0 comments on commit 3844527

Please sign in to comment.