From 1aa095f7dd14f64bcaec22853dbaea1d85befaf9 Mon Sep 17 00:00:00 2001 From: Leon Gersen Date: Thu, 11 Sep 2014 18:44:22 +0200 Subject: [PATCH] noUiSlider dist submodule --- .gitmodules | 3 +++ Gruntfile.js | 35 +++++++++++++++++++++++++---------- README.md | 22 +++++----------------- nouislider.jquery.json | 2 +- package.json | 3 ++- submodules/noUiSlider-dist | 1 + 6 files changed, 37 insertions(+), 29 deletions(-) create mode 160000 submodules/noUiSlider-dist diff --git a/.gitmodules b/.gitmodules index 28e29886..9f7e566a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "submodules/libLink"] path = submodules/libLink url = https://github.com/leongersen/libLink +[submodule "submodules/noUiSlider-dist"] + path = submodules/noUiSlider-dist + url = https://github.com/leongersen/noUiSlider-dist diff --git a/Gruntfile.js b/Gruntfile.js index 1b161672..153794cf 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -31,6 +31,12 @@ module.exports = function(grunt) { 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 } + ]; + grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), concat: { @@ -100,21 +106,27 @@ module.exports = function(grunt) { options: { archive: 'noUiSlider.<%= pkg.version %>.zip' }, - files: [ - { 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 } - ] + files: releaseFiles + } + }, + copy: { + all: { + expand: true, + cwd: 'distribute/', + src: '**', + dest: 'submodules/noUiSlider-dist/', + flatten: true, + filter: 'isFile' } } }); // https://github.com/gruntjs/grunt-contrib-concat grunt.loadNpmTasks('grunt-contrib-concat'); - + // https://github.com/gruntjs/grunt-contrib-uglify grunt.loadNpmTasks('grunt-contrib-uglify'); - + // https://github.com/gruntjs/grunt-contrib-jshint grunt.loadNpmTasks('grunt-contrib-jshint'); @@ -123,11 +135,14 @@ module.exports = function(grunt) { // https://github.com/gruntjs/grunt-contrib-cssmin grunt.loadNpmTasks('grunt-contrib-cssmin'); - + // https://github.com/gruntjs/grunt-contrib-compress grunt.loadNpmTasks('grunt-contrib-compress'); - + + // https://www.npmjs.org/package/grunt-contrib-copy + grunt.loadNpmTasks('grunt-contrib-copy'); + grunt.registerTask('default', ['concat', 'jshint']); grunt.registerTask('create', ['concat', 'jshint', 'uglify', 'cssmin']); - grunt.registerTask('release', ['string-replace', 'compress']); + grunt.registerTask('release', ['string-replace', 'compress', 'copy']); }; diff --git a/README.md b/README.md index e445cc34..13e0ce92 100644 --- a/README.md +++ b/README.md @@ -8,30 +8,18 @@ An extensive documentation, including **examples**, **options** and **configurat Bower ----- -Bower users can install all compiled and minified files easily. +Bower users can install all compiled and minified files easily using `bower install noUiSlider --save`. +This will install [a separate repository](https://github.com/leongersen/noUiSlider-dist) which is only used for Bower. -Run: -``` -bower install https://github.com/leongersen/noUiSlider/releases/download/<>/noUiSlider.<>.zip -``` - -Or create a `bower.json` with the following dependency: -``` -"noUiSlider": "https://github.com/leongersen/noUiSlider/releases/download/<>/noUiSlider.<>.zip" -``` - -You can read more about the absence of minified files in [this blog post](http://refreshless.com/blog/git-repository-commit-minified-bower/). +You can read more about the absence of minified files for this repository in [this blog post](http://refreshless.com/blog/git-repository-commit-minified-bower/). Changelog --------- -###7.0.4: -+ Removed minified files. -+ Added a direct release for Bower users. +###7.0.5 ++ Moved Bower support. ###7.0.3: + Fixed an issue with Link on single-handle RTL sliders. -+ Added minified files for Bower users. -+ Version information in minified JS. ###7.0.2: + Fixed an issue with the handle `z-index`. (#333) diff --git a/nouislider.jquery.json b/nouislider.jquery.json index 2be92574..061c565b 100644 --- a/nouislider.jquery.json +++ b/nouislider.jquery.json @@ -16,7 +16,7 @@ "url": "http://www.wtfpl.net/" } ], - "version": "7.0.4", + "version": "7.0.5", "author": { "name": "Léon Gersen", "url": "https://twitter.com/LeonGersen" diff --git a/package.json b/package.json index 233efb58..cf7eb340 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,11 @@ { "name": "noUiSlider", - "version": "7.0.4", + "version": "7.0.5", "devDependencies": { "grunt": "~0.4.1", "grunt-contrib-compress": "^0.11.0", "grunt-contrib-concat": "^0.5.0", + "grunt-contrib-copy": "^0.5.0", "grunt-contrib-cssmin": "^0.10.0", "grunt-contrib-jshint": "^0.10.0", "grunt-contrib-uglify": "^0.5.1", diff --git a/submodules/noUiSlider-dist b/submodules/noUiSlider-dist new file mode 160000 index 00000000..f39aed14 --- /dev/null +++ b/submodules/noUiSlider-dist @@ -0,0 +1 @@ +Subproject commit f39aed148ad6bc199deffba1ee0e3e92b75e1225