improvement to query string parsing

enovajuan · Nov 27, 2013 · b314cf7 · b314cf7
1 parent 69bf9b5
commit b314cf7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -69,7 +69,8 @@ module.exports = function(grunt) {
 				globals: {
 					head: false,
 					module: false,
-					console: false
+					console: false,
+					unescape: false
 				}
 			},
 			files: [ 'Gruntfile.js', 'js/reveal.js' ]

diff --git a/js/reveal.js b/js/reveal.js
@@ -3300,17 +3300,20 @@ var Reveal = (function(){
 		getQueryHash: function() {
 			var query = {};
 
-			location.search.replace( /[A-Z0-9]+?=(\w*)/gi, function(a) {
+			location.search.replace( /[A-Z0-9]+?=([\w\.%-]*)/gi, function(a) {
 				query[ a.split( '=' ).shift() ] = a.split( '=' ).pop();
 			} );
 
 			// Basic deserialization
 			for( var i in query ) {
 				var value = query[ i ];
+
+				query[ i ] = unescape( value );
+
 				if( value === 'null' ) query[ i ] = null;
 				else if( value === 'true' ) query[ i ] = true;
 				else if( value === 'false' ) query[ i ] = false;
-				else if( !isNaN( parseFloat( value ) ) ) query[ i ] = parseFloat( value );
+				else if( value.match( /^\d+$/ ) ) query[ i ] = parseFloat( value );
 			}
 
 			return query;