cleanup for #12

ljharb · Aug 7, 2014 · 0676904 · 0676904
1 parent ebee69a
commit 0676904
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/lib/parse.js b/lib/parse.js
@@ -6,21 +6,19 @@ var Utils = require('./utils');
 // Declare internals
 
 var internals = {
-    delim: '&',
+    delimiter: '&',
     depth: 5,
     arrayLimit: 20,
     parametersLimit: 1000
 };
 
 
-internals.parseValues = function (str, delim) {
+internals.parseValues = function (str, delimiter) {
 
-    if (typeof delim === 'undefined') {
-        delim = internals.delim;
-    }
+    delimiter = typeof delimiter === 'undefined' ? internals.delimiter : delimiter;
 
     var obj = {};
-    var parts = str.split(delim, internals.parametersLimit);
+    var parts = str.split(delimiter, internals.parametersLimit);
 
     for (var i = 0, il = parts.length; i < il; ++i) {
         var part = parts[i];
@@ -84,8 +82,6 @@ internals.parseKeys = function (key, val, depth) {
         return;
     }
 
-    depth = typeof depth === 'undefined' ? internals.depth : depth;
-
     // The regex chunks
 
     var parent = /^([^\[\]]*)/;
@@ -129,7 +125,7 @@ internals.parseKeys = function (key, val, depth) {
 };
 
 
-module.exports = function (str, depth, delim) {
+module.exports = function (str, depth, delimiter) {
 
     if (str === '' ||
         str === null ||
@@ -139,11 +135,11 @@ module.exports = function (str, depth, delim) {
     }
 
     if (typeof depth !== 'number') {
-        delim = depth;
+        delimiter = depth;
         depth = internals.depth;
     }
 
-    var tempObj = typeof str === 'string' ? internals.parseValues(str, delim) : Utils.clone(str);
+    var tempObj = typeof str === 'string' ? internals.parseValues(str, delimiter) : Utils.clone(str);
     var obj = {};
 
     // Iterate over the keys and setup the new object

diff --git a/lib/stringify.js b/lib/stringify.js
@@ -4,7 +4,7 @@
 // Declare internals
 
 var internals = {
-    delim: '&'
+    delimiter: '&'
 };
 
 
@@ -39,11 +39,9 @@ internals.stringify = function (obj, prefix) {
 };
 
 
-module.exports = function (obj, delim) {
+module.exports = function (obj, delimiter) {
 
-    if (typeof delim === 'undefined') {
-        delim = internals.delim;
-    }
+    delimiter = typeof delimiter === 'undefined' ? internals.delimiter : delimiter;
 
     var keys = [];
 
@@ -53,5 +51,5 @@ module.exports = function (obj, delim) {
         }
     }
 
-    return keys.join(delim);
+    return keys.join(delimiter);
 };