Merge pull request locutusjs#139 from codemasher/master

kvz · kvz · commit 21620a5736a8 · 2014-02-07T15:56:14.000+01:00
Fixed locutusjs#138 and did some cleanup
diff --git a/functions/array/array_multisort.js b/functions/array/array_multisort.js
@@ -16,43 +16,28 @@ function array_multisort(arr) {
   //        bits: HGFE DCBA
   //        args: Holds pointer to arguments for reassignment
 
-  var argl = arguments.length,
-    sal = 0,
-    flags = {
-      'SORT_REGULAR': 16,
-      'SORT_NUMERIC': 17,
-      'SORT_STRING': 18,
-      'SORT_ASC': 32,
-      'SORT_DESC': 40
-    },
-    sortArrs = [
-      []
-    ],
-    sortFlag = [0],
-    sortKeys = [
-      []
-    ],
-    g = 0,
-    i = 0,
-    j = 0,
-    k = '',
-    l = 0,
-    thingsToSort = [],
-    vkey = 0,
-    zlast = null,
-    args = arguments,
-    nLastSort = [],
-    lastSort = [],
-    lastSorts = [],
-    tmpArray = [],
-    elIndex = 0,
-    sortDuplicator = function(a, b) {
-      return nLastSort.shift();
-    };
+  var g, i, j, k, l, sal, vkey, elIndex, lastSorts, tmpArray, zlast;
 
-  sortFunctions = [
-    [
+  var sortFlag = [0];
+  var thingsToSort = [];
+  var nLastSort = [];
+  var lastSort = [];
+  var args = arguments; // possibly redundant
 
+  var flags = {
+    'SORT_REGULAR': 16,
+    'SORT_NUMERIC': 17,
+    'SORT_STRING': 18,
+    'SORT_ASC': 32,
+    'SORT_DESC': 40
+  };
+
+  var sortDuplicator = function(a, b) {
+    return nLastSort.shift();
+  };
+
+  var sortFunctions = [
+    [
       function(a, b) {
         lastSort.push(a > b ? 1 : (a < b ? -1 : 0));
         return a > b ? 1 : (a < b ? -1 : 0);
@@ -63,7 +48,6 @@ function array_multisort(arr) {
       }
     ],
     [
-
       function(a, b) {
         lastSort.push(a - b);
         return a - b;
@@ -74,7 +58,6 @@ function array_multisort(arr) {
       }
     ],
     [
-
       function(a, b) {
         lastSort.push((a + '') > (b + '') ? 1 : ((a + '') < (b + '') ? -1 : 0));
         return (a + '') > (b + '') ? 1 : ((a + '') < (b + '') ? -1 : 0);
@@ -86,6 +69,14 @@ function array_multisort(arr) {
     ]
   ];
 
+  var sortArrs = [
+    []
+  ];
+
+  var sortKeys = [
+    []
+  ];
+
   // Store first argument into sortArrs and sortKeys if an Object.
   // First Argument should be either a Javascript Array or an Object, otherwise function would return FALSE like in PHP
   if (Object.prototype.toString.call(arr) === '[object Array]') {
@@ -104,10 +95,11 @@ function array_multisort(arr) {
   // arrMainLength: Holds the length of the first array. All other arrays must be of equal length, otherwise function would return FALSE like in PHP
   //
   // sortComponents: Holds 2 indexes per every section of the array that can be sorted. As this is the start, the whole array can be sorted.
-  var arrMainLength = sortArrs[0].length,
-    sortComponents = [0, arrMainLength];
+  var arrMainLength = sortArrs[0].length;
+  var sortComponents = [0, arrMainLength];
 
   // Loop through all other arguments, checking lengths and sort flags of arrays and adding them to the above variables.
+  var argl = arguments.length;
   for (j = 1; j < argl; j++) {
     if (Object.prototype.toString.call(arguments[j]) === '[object Array]') {
       sortArrs[j] = arguments[j];
@@ -130,7 +122,8 @@ function array_multisort(arr) {
       }
     } else if (typeof arguments[j] === 'string') {
       var lFlag = sortFlag.pop();
-      if (typeof flags[arguments[j]] === 'undefined' || ((((flags[arguments[j]]) >>> 4) & (lFlag >>> 4)) > 0)) { // Keep extra parentheses around latter flags check to avoid minimization leading to CDATA closer
+      // Keep extra parentheses around latter flags check to avoid minimization leading to CDATA closer
+      if (typeof flags[arguments[j]] === 'undefined' || ((((flags[arguments[j]]) >>> 4) & (lFlag >>> 4)) > 0)) {
         return false;
       }
       sortFlag.push(lFlag + flags[arguments[j]]);
@@ -152,7 +145,7 @@ function array_multisort(arr) {
       nLastSort = [];
       lastSort = [];
 
-      // If ther are no sortComponents, then no more sorting is neeeded. Copy the array back to the argument.
+      // If there are no sortComponents, then no more sorting is neeeded. Copy the array back to the argument.
       if (sortComponents.length === 0) {
         if (Object.prototype.toString.call(arguments[i]) === '[object Array]') {
           args[i] = sortArrs[i];
