Skip to content

Commit

Permalink
Merge branch 'Useclark-css'
Browse files Browse the repository at this point in the history
  • Loading branch information
leongersen committed Jul 6, 2015
2 parents 990008c + 9f3f128 commit c41e621
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Browserify
This library is [UMD](https://github.com/umdjs/umd) compatible, so you can use it in this way:

```javascript
require('nouislider');
var noUiSlider = require('nouislider');

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

Expand Down
7 changes: 5 additions & 2 deletions distribute/nouislider.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! nouislider - 8.0.1 - 2015-07-01 13:32:17 */
/*! nouislider - 8.0.1 - 2015-07-03 09:58:06 */

/*jslint browser: true */
/*jslint white: true */
Expand All @@ -11,9 +11,12 @@
define([], factory);

} else if ( typeof exports === 'object' ) {

var fs = require('fs');
// Node/CommonJS
module.exports = factory();
module.exports.css = function () {
return fs.readFileSync(__dirname + '/nouislider.min.css', 'utf8');
};

} else {

Expand Down
2 changes: 1 addition & 1 deletion distribute/nouislider.min.css

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

4 changes: 2 additions & 2 deletions distribute/nouislider.min.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,10 @@
"repository": {
"type": "git",
"url": "git://github.com/leongersen/noUiSlider.git"
},
"browserify": {
"transform": [
"brfs"
]
}
}
5 changes: 4 additions & 1 deletion src/js/intro.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
define([], factory);

} else if ( typeof exports === 'object' ) {

var fs = require('fs');
// Node/CommonJS
module.exports = factory();
module.exports.css = function () {
return fs.readFileSync(__dirname + '/nouislider.min.css', 'utf8');
};

} else {

Expand Down

0 comments on commit c41e621

Please sign in to comment.