Fixes issues that caused IE7/8 to fail

index.js

@@ -17,6 +17,9 @@ var hasOwnProperty = Object.prototype.hasOwnProperty;
 var indexOf = typeof Array.prototype.indexOf === 'function'
   ? function(arr, el) { return arr.indexOf(el); }
   : function(arr, el) {
+      if (!isArray(arr)) {
+        arr = arr.split('');
+      }
       for (var i = 0; i < arr.length; i++) {
         if (arr[i] === el) return i;
       }
@@ -341,6 +344,9 @@ function lastBraceInKey(str) {
   var len = str.length
     , brace
     , c;
+  if (!isArray(str)) {
+    str = str.split('');
+  }
   for (var i = 0; i < len; ++i) {
     c = str[i];
     if (']' == c) brace = false;
@@ -363,4 +369,4 @@ function decode(str) {
   } catch (err) {
     return str;
   }
-}
+}

test/browser/qs.js

@@ -102,13 +102,22 @@ require.register("querystring", function(module, exports, require){
 
 var toString = Object.prototype.toString;
 
+/**
+ * Object#hasOwnProperty ref
+ */
+
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+
 /**
  * Array#indexOf shim.
  */
 
 var indexOf = typeof Array.prototype.indexOf === 'function'
   ? function(arr, el) { return arr.indexOf(el); }
   : function(arr, el) {
+      if (!isArray(arr)) {
+        arr = arr.split('');
+      }
       for (var i = 0; i < arr.length; i++) {
         if (arr[i] === el) return i;
       }
@@ -129,7 +138,11 @@ var isArray = Array.isArray || function(arr) {
 
 var objectKeys = Object.keys || function(obj) {
   var ret = [];
-  for (var key in obj) ret.push(key);
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      ret.push(key);
+    }
+  }
   return ret;
 };
 
@@ -161,15 +174,23 @@ var reduce = function(arr, fn, initial) {
 var isint = /^[0-9]+$/;
 
 function promote(parent, key) {
-  if (parent[key].length == 0) return parent[key] = {};
+  if (parent[key].length == 0) return parent[key] = {}
   var t = {};
-  for (var i in parent[key]) t[i] = parent[key][i];
+  for (var i in parent[key]) {
+    if (hasOwnProperty.call(parent[key], i)) {
+      t[i] = parent[key][i];
+    }
+  }
   parent[key] = t;
   return t;
 }
 
 function parse(parts, parent, key, val) {
   var part = parts.shift();
+
+  // illegal
+  if (hasOwnProperty.call(Object.prototype, key)) return;
+
   // end
   if (!part) {
     if (isArray(parent[key])) {
@@ -228,24 +249,52 @@ function merge(parent, key, val){
   return parent;
 }
 
+/**
+ * Compact sparse arrays.
+ */
+
+function compact(obj) {
+  if ('object' != typeof obj) return obj;
+
+  if (isArray(obj)) {
+    var ret = [];
+
+    for (var i in obj) {
+      if (hasOwnProperty.call(obj, i)) {
+        ret.push(obj[i]);
+      }
+    }
+
+    return ret;
+  }
+
+  for (var key in obj) {
+    obj[key] = compact(obj[key]);
+  }
+
+  return obj;
+}
+
 /**
  * Parse the given obj.
  */
 
 function parseObject(obj){
   var ret = { base: {} };
+
   forEach(objectKeys(obj), function(name){
     merge(ret, name, obj[name]);
   });
-  return ret.base;
+
+  return compact(ret.base);
 }
 
 /**
  * Parse the given str.
  */
 
 function parseString(str){
-  return reduce(String(str).split('&'), function(ret, pair){
+  var ret = reduce(String(str).split('&'), function(ret, pair){
     var eql = indexOf(pair, '=')
       , brace = lastBraceInKey(pair)
       , key = pair.substr(0, brace || eql)
@@ -258,6 +307,8 @@ function parseString(str){
 
     return merge(ret, decode(key), decode(val));
   }, { base: {} }).base;
+
+  return compact(ret);
 }
 
 /**
@@ -343,6 +394,7 @@ function stringifyObject(obj, prefix) {
 
   for (var i = 0, len = keys.length; i < len; ++i) {
     key = keys[i];
+    if ('' == key) continue;
     if (null == obj[key]) {
       ret.push(encodeURIComponent(key) + '=');
     } else {
@@ -368,6 +420,7 @@ function stringifyObject(obj, prefix) {
 
 function set(obj, key, val) {
   var v = obj[key];
+  if (hasOwnProperty.call(Object.prototype, key)) return;
   if (undefined === v) {
     obj[key] = val;
   } else if (isArray(v)) {
@@ -389,6 +442,9 @@ function lastBraceInKey(str) {
   var len = str.length
     , brace
     , c;
+  if (!isArray(str)) {
+    str = str.split('');
+  }
   for (var i = 0; i < len; ++i) {
     c = str[i];
     if (']' == c) brace = false;
@@ -413,4 +469,4 @@ function decode(str) {
   }
 }
 })();
-});
+});

test/parse.js

@@ -177,4 +177,4 @@ describe('qs.parse()', function(){
     Object.prototype.crash = '';
     expect(qs.parse.bind(null, 'test')).to.not.throwException();
   })
-})
+})

test/stringify.js

@@ -236,5 +236,4 @@ describe('qs.stringify', function(){
 		   	expect(qs.stringify(obj)).to.eql(str); 
 	   });	   
 	});
-});
-
+});