Merge branch 'master' into dev

leongersen · Jan 20, 2018 · afc8a67 · afc8a67
2 parents 784f793 + 982c210
commit afc8a67
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -27,6 +27,11 @@ npm [(package)](https://www.npmjs.com/package/nouislider)
 Changelog
 ---------
 
+### 11.0.1 (*2018-01-20*)
+- Fixed: Slider ignores clicks on `.noUi-target` outside of `.noUi-base` (#842);
+- Fixed: `.noUi-origin` moving out of the page causes horizontal scrolling (#852);
+- Fixed: Relative `.noUi-handle` has unintended margin (#854);
+
 ### 11.0.0 (*2018-01-12*)
 noUiSlider 11 doesn't include any breaking API changes.
 Unless major changes were made to the stylesheet or you specifically depend

diff --git a/distribute/nouislider.css b/distribute/nouislider.css
@@ -1,4 +1,4 @@
-/*! nouislider - 11.0.0 - 2018-01-12 20:37:52 */
+/*! nouislider - 11.0.1 - 2018-01-20 18:00:49 */
 /* Functional styling;
  * These styles are required for noUiSlider to function.
  * You don't need to change these rules to apply your design.

diff --git a/distribute/nouislider.js b/distribute/nouislider.js
@@ -1,4 +1,4 @@
-/*! nouislider - 11.0.0 - 2018-01-12 20:37:52 */
+/*! nouislider - 11.0.1 - 2018-01-20 18:00:49 */
 
 (function (factory) {
 
@@ -22,7 +22,7 @@
 
 	'use strict';
 
-	var VERSION = '11.0.0';
+	var VERSION = '11.0.1';
 
 
 	function isValidFormatter ( entry ) {

diff --git a/distribute/nouislider.min.css b/distribute/nouislider.min.css
diff --git a/distribute/nouislider.min.js b/distribute/nouislider.min.js
diff --git a/documentation/_run/index.php b/documentation/_run/index.php
@@ -13,8 +13,8 @@
 	<link href="/nouislider/documentation/assets/prism.css" rel="stylesheet">
 	<script src="/nouislider/documentation/assets/wNumb.js"></script>
 
-	<link href="<?php echo $distribute; ?>/nouislider.css?v=1010" rel="stylesheet">
-	<script src="<?php echo $distribute; ?>/nouislider.js?v=1010"></script>
+	<link href="<?php echo $distribute; ?>/nouislider.css?v=<?php echo $plain_version; ?>" rel="stylesheet">
+	<script src="<?php echo $distribute; ?>/nouislider.js?v=<?php echo $plain_version; ?>"></script>
 	<?php /* <script src="/nouislider/concat.php"></script> */ ?>
 
 </head>

diff --git a/documentation/_run/router.php b/documentation/_run/router.php
@@ -23,6 +23,10 @@
 	$title = "";
 	$description = "";
 
+	$package = json_decode(file_get_contents('./../package.json'));
+	$version = $package->version;
+	$plain_version = str_replace('.', '', $version);
+
 	ob_start();
 
 	include $file;

diff --git a/documentation/download.php b/documentation/download.php
@@ -11,7 +11,7 @@
 
 		<p>noUiSlider is open source, and you can use it <strong>for free</strong> in any personal or commercial product. No attribution required. Both the uncompressed and compressed version of noUiSlider are available in a <code>.zip</code> release, which is hosted by Github and available over <code>https</code>.</p>
 
-		<a class="button" href="https://github.com/leongersen/noUiSlider/releases/download/11.0.0/noUiSlider.11.0.0.zip" data-category="convert" data-action="download">Download noUiSlider from Github</a>
+		<a class="button" href="https://github.com/leongersen/noUiSlider/releases/download/<?php echo $version; ?>/noUiSlider.<?php echo $version; ?>.zip" data-category="convert" data-action="download">Download noUiSlider from Github</a>
 
 		<div class="share">
 			<iframe src="https://ghbtns.com/github-btn.html?user=leongersen&repo=noUiSlider&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nouislider",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "main": "distribute/nouislider",
   "style": "distribute/nouislider.min.css",
   "license": "WTFPL",