accept 'null' option resets

Piees · Apr 2, 2018 · 1b7301a · 1b7301a
1 parent efdf079
commit 1b7301a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/documentation/_run/router.php b/documentation/_run/router.php
@@ -4,7 +4,7 @@
 
 	$url = strtolower($_SERVER['REQUEST_URI']);
 
-	if ( strpos($url, '.js') || strpos($url, '.css') ) {
+	if ( strpos($url, '.js') || strpos($url, '.css') || strpos($url, '.html') ) {
 		return false;
 	}
 

diff --git a/src/js/helpers.js b/src/js/helpers.js
@@ -7,6 +7,10 @@
 		el.parentElement.removeChild(el);
 	}
 
+	function isSet ( value ) {
+		return value !== null && value !== undefined;
+	}
+
 	// Bindable version
 	function preventDefault ( e ) {
 		e.preventDefault();

diff --git a/src/js/options.js b/src/js/options.js
@@ -214,6 +214,10 @@
 		if ( parsed.padding[0] < 0 || parsed.padding[1] < 0 ) {
 			throw new Error("noUiSlider (" + VERSION + "): 'padding' option must be a positive number(s).");
 		}
+
+		if ( parsed.padding[0] + parsed.padding[1] >= 100 ) {
+			throw new Error("noUiSlider (" + VERSION + "): 'padding' option must not exceed 100% of the range.");
+		}
 	}
 
 	function testDirection ( parsed, entry ) {
@@ -310,7 +314,7 @@
 
 	function testCssPrefix ( parsed, entry ) {
 
-		if ( entry !== undefined && typeof entry !== 'string' && entry !== false ) {
+		if ( typeof entry !== 'string' && entry !== false ) {
 			throw new Error("noUiSlider (" + VERSION + "): 'cssPrefix' must be a string or `false`.");
 		}
 
@@ -319,7 +323,7 @@
 
 	function testCssClasses ( parsed, entry ) {
 
-		if ( entry !== undefined && typeof entry !== 'object' ) {
+		if ( typeof entry !== 'object' ) {
 			throw new Error("noUiSlider (" + VERSION + "): 'cssClasses' must be an object.");
 		}
 
@@ -371,8 +375,8 @@
 			'ariaFormat': { r: false, t: testAriaFormat },
 			'format': { r: false, t: testFormat },
 			'tooltips': { r: false, t: testTooltips },
-			'cssPrefix': { r: false, t: testCssPrefix },
-			'cssClasses': { r: false, t: testCssClasses }
+			'cssPrefix': { r: true, t: testCssPrefix },
+			'cssClasses': { r: true, t: testCssClasses }
 		};
 
 		var defaults = {
@@ -429,7 +433,7 @@
 		Object.keys(tests).forEach(function( name ){
 
 			// If the option isn't set, but it is required, throw an error.
-			if ( options[name] === undefined && defaults[name] === undefined ) {
+			if ( !isSet(options[name]) && defaults[name] === undefined ) {
 
 				if ( tests[name].r ) {
 					throw new Error("noUiSlider (" + VERSION + "): '" + name + "' is required.");
@@ -438,7 +442,7 @@
 				return true;
 			}
 
-			tests[name].t( parsed, options[name] === undefined ? defaults[name] : options[name] );
+			tests[name].t( parsed, !isSet(options[name]) ? defaults[name] : options[name] );
 		});
 
 		// Forward pips options

diff --git a/tests/slider_errors.js b/tests/slider_errors.js
@@ -110,6 +110,8 @@
 		noUiSlider.create(slider, {
 			start: 1,
 			margin: 0, // Does not throw, issue #582
+			cssPrefix: null, // #856
+			step: null,
 			range: {
 				'min': 0,
 				'max': 10