Merge pull request locutusjs#95 from tersmitten/typeof-is-not-a-function

kvz · kvz · commit f31f0e43a172 · 2013-05-31T01:26:22.000-07:00
Typeof is not a function
diff --git a/functions/_phpjs_shared/_phpjs_shared_bc.js b/functions/_phpjs_shared/_phpjs_shared_bc.js
@@ -1118,7 +1118,7 @@ function _phpjs_shared_bc () {
     },
 
     cint: function (v) {
-      if (typeof(v) == 'undefined') {
+      if (typeof v === 'undefined') {
         v = 0;
       }
       var x = parseInt(v, 10);
diff --git a/functions/array/array_count_values.js b/functions/array/array_count_values.js
@@ -27,7 +27,7 @@ function array_count_values (array) {
   };
 
   var __countValue = function (value) {
-    switch (typeof(value)) {
+    switch (typeof value) {
     case "number":
       if (Math.floor(value) !== value) {
         return;
diff --git a/functions/array/array_walk_recursive.js b/functions/array/array_walk_recursive.js
@@ -12,11 +12,11 @@ function array_walk_recursive (array, funcname, userdata) {
   }
 
   for (key in array) {
-    if (typeof array[key] == 'object') {
+    if (typeof array[key] === 'object') {
       return this.array_walk_recursive(array[key], funcname, userdata);
     }
 
-    if (typeof(userdata) != 'undefined') {
+    if (typeof userdata !== 'undefined') {
       eval(funcname + '( array [key] , key , userdata  )');
     } else {
       eval(funcname + '(  userdata ) ');
diff --git a/functions/bc/bcadd.js b/functions/bc/bcadd.js
@@ -15,7 +15,7 @@ function bcadd (left_operand, right_operand, scale) {
 
   var first, second, result;
 
-  if (typeof(scale) == 'undefined') {
+  if (typeof scale === 'undefined') {
     scale = libbcmath.scale;
   }
   scale = ((scale < 0) ? 0 : scale);
diff --git a/functions/bc/bccomp.js b/functions/bc/bccomp.js
@@ -14,7 +14,7 @@ function bccomp (left_operand, right_operand, scale) {
   var libbcmath = this._phpjs_shared_bc();
 
   var first, second; //bc_num
-  if (typeof(scale) == 'undefined') {
+  if (typeof scale === 'undefined') {
     scale = libbcmath.scale;
   }
   scale = ((scale < 0) ? 0 : scale);
diff --git a/functions/bc/bcdiv.js b/functions/bc/bcdiv.js
@@ -20,7 +20,7 @@ function bcdiv (left_operand, right_operand, scale) {
 
   var first, second, result;
 
-  if (typeof(scale) == 'undefined') {
+  if (typeof scale === 'undefined') {
     scale = libbcmath.scale;
   }
   scale = ((scale < 0) ? 0 : scale);
diff --git a/functions/bc/bcmul.js b/functions/bc/bcmul.js
@@ -16,7 +16,7 @@ function bcmul (left_operand, right_operand, scale) {
 
   var first, second, result;
 
-  if (typeof(scale) == 'undefined') {
+  if (typeof scale === 'undefined') {
     scale = libbcmath.scale;
   }
   scale = ((scale < 0) ? 0 : scale);
diff --git a/functions/bc/bcsub.js b/functions/bc/bcsub.js
@@ -17,7 +17,7 @@ function bcsub (left_operand, right_operand, scale) {
 
   var first, second, result;
 
-  if (typeof(scale) == 'undefined') {
+  if (typeof scale === 'undefined') {
     scale = libbcmath.scale;
   }
   scale = ((scale < 0) ? 0 : scale);
diff --git a/functions/datetime/getdate.js b/functions/datetime/getdate.js
@@ -7,8 +7,8 @@ function getdate (timestamp) {
   // *     returns 1: {'seconds': 40, 'minutes': 58, 'hours': 21, 'mday': 17, 'wday': 2, 'mon': 6, 'year': 2003, 'yday': 167, 'weekday': 'Tuesday', 'month': 'June', '0': 1055901520}
   var _w = ['Sun', 'Mon', 'Tues', 'Wednes', 'Thurs', 'Fri', 'Satur'];
   var _m = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
-  var d = ((typeof(timestamp) == 'undefined') ? new Date() : // Not provided
-  (typeof(timestamp) == 'object') ? new Date(timestamp) : // Javascript Date()
+  var d = ((typeof timestamp === 'undefined') ? new Date() : // Not provided
+  (typeof timestamp === 'object') ? new Date(timestamp) : // Javascript Date()
   new Date(timestamp * 1000) // UNIX timestamp (auto-convert to int)
   );
   var w = d.getDay();
diff --git a/functions/datetime/gmstrftime.js b/functions/datetime/gmstrftime.js
@@ -6,8 +6,8 @@ function gmstrftime (format, timestamp) {
   // -    depends on: strftime
   // *     example 1: gmstrftime("%A", 1062462400);
   // *     returns 1: 'Tuesday'
-  var dt = ((typeof(timestamp) == 'undefined') ? new Date() : // Not provided
-  (typeof(timestamp) == 'object') ? new Date(timestamp) : // Javascript Date()
+  var dt = ((typeof timestamp === 'undefined') ? new Date() : // Not provided
+  (typeof timestamp === 'object') ? new Date(timestamp) : // Javascript Date()
   new Date(timestamp * 1000) // UNIX timestamp (auto-convert to int)
   );
   timestamp = Date.parse(dt.toUTCString().slice(0, -4)) / 1000;
diff --git a/functions/datetime/strftime.js b/functions/datetime/strftime.js
@@ -174,8 +174,8 @@ OW
 Oy
 */
 
-  var _date = ((typeof(timestamp) == 'undefined') ? new Date() : // Not provided
-  (typeof(timestamp) == 'object') ? new Date(timestamp) : // Javascript Date()
+  var _date = ((typeof timestamp === 'undefined') ? new Date() : // Not provided
+  (typeof timestamp === 'object') ? new Date(timestamp) : // Javascript Date()
   new Date(timestamp * 1000) // PHP API expects UNIX timestamp (auto-convert to int)
   );
 
@@ -209,7 +209,7 @@ Oy
       return _date[f]();
     } else if (typeof f === 'function') {
       return f(_date);
-    } else if (typeof f === 'object' && typeof(f[0]) === 'string') {
+    } else if (typeof f === 'object' && typeof f[0] === 'string') {
       return _xPad(_date[f[0]](), f[1]);
     } else { // Shouldn't reach here
       return m1;
diff --git a/functions/datetime/strtotime.js b/functions/datetime/strtotime.js
@@ -69,7 +69,7 @@ function strtotime (text, now) {
 	function lastNext(type, range, modifier) {
 		var day = days[range];
 
-		if (typeof(day) !== 'undefined') {
+		if (typeof day !== 'undefined') {
 			var diff = day - date.getDay();
 
 			if (diff === 0)
diff --git a/functions/filesystem/basename.js b/functions/filesystem/basename.js
@@ -10,7 +10,7 @@ function basename (path, suffix) {
   // *     returns 2: 'ecra.php?p=1'
   var b = path.replace(/^.*[\/\\]/g, '');
 
-  if (typeof(suffix) == 'string' && b.substr(b.length - suffix.length) == suffix) {
+  if (typeof suffix === 'string' && b.substr(b.length - suffix.length) == suffix) {
     b = b.substr(0, b.length - suffix.length);
   }
 
diff --git a/functions/language/require.js b/functions/language/require.js
@@ -23,7 +23,7 @@ function require (filename) {
     script_block.appendChild(d.createTextNode(js_code));
   }
 
-  if (typeof(script_block) !== 'undefined') {
+  if (typeof script_block !== 'undefined') {
     d.getElementsByTagNameNS && isXML ? (d.getElementsByTagNameNS('http://www.w3.org/1999/xhtml', 'head')[0] ? d.getElementsByTagNameNS('http://www.w3.org/1999/xhtml', 'head')[0].appendChild(script_block) : d.documentElement.insertBefore(script_block, d.documentElement.firstChild) // in case of XUL
     ) : d.getElementsByTagName('head')[0].appendChild(script_block);
 
diff --git a/functions/misc/pack.js b/functions/misc/pack.js
@@ -79,7 +79,7 @@ function pack (format) {
       for (i = 0; i < quantifier; i += 2) {
         // Always get per 2 bytes...
         word = argument[i];
-        if (((i + 1) >= quantifier) || typeof(argument[i + 1]) === 'undefined') {
+        if (((i + 1) >= quantifier) || typeof argument[i + 1] === 'undefined') {
           word += '0';
         } else {
           word += argument[i + 1];
diff --git a/functions/network/setrawcookie.js b/functions/network/setrawcookie.js
@@ -13,7 +13,7 @@ function setrawcookie (name, value, expires, path, domain, secure) {
 
   if (expires instanceof Date) {
     expires = expires.toGMTString();
-  } else if (typeof(expires) === 'number') {
+  } else if (typeof expires === 'number') {
     expires = (new Date(expires * 1e3)).toGMTString();
   }
 
diff --git a/functions/strings/implode.js b/functions/strings/implode.js
@@ -15,7 +15,7 @@ function implode (glue, pieces) {
     pieces = glue;
     glue = '';
   }
-  if (typeof(pieces) === 'object') {
+  if (typeof pieces === 'object') {
     if (Object.prototype.toString.call(pieces) === '[object Array]') {
       return pieces.join(glue);
     }
diff --git a/functions/url/http_build_query.js b/functions/url/http_build_query.js
@@ -26,14 +26,14 @@ function http_build_query (formdata, numeric_prefix, arg_separator) {
       val = "0";
     }
     if (val != null) {
-      if(typeof(val) === "object") {
+      if(typeof val === "object") {
         for (k in val) {
           if (val[k] != null) {
             tmp.push(_http_build_query_helper(key + "[" + k + "]", val[k], arg_separator));
           }
         }
         return tmp.join(arg_separator);
-      } else if (typeof(val) !== "function") {
+      } else if (typeof val !== "function") {
         return that.urlencode(key) + "=" + that.urlencode(val);
       } else {
         throw new Error('There was an error processing for http_build_query().');
diff --git a/functions/var/intval.js b/functions/var/intval.js
@@ -18,7 +18,7 @@ function intval (mixed_var, base) {
   // *     returns 5: 30
   var tmp;
 
-  var type = typeof(mixed_var);
+  var type = typeof mixed_var;
 
   if (type === 'boolean') {
     return +mixed_var;
diff --git a/functions/var/is_numeric.js b/functions/var/is_numeric.js
@@ -16,5 +16,5 @@ function is_numeric (mixed_var) {
   // *     returns 4: false
   // *     example 4: is_numeric([]);
   // *     returns 4: false
-  return (typeof(mixed_var) === 'number' || typeof(mixed_var) === 'string') && mixed_var !== '' && !isNaN(mixed_var);
+  return (typeof mixed_var === 'number' || typeof mixed_var === 'string') && mixed_var !== '' && !isNaN(mixed_var);
 }
diff --git a/functions/var/is_string.js b/functions/var/is_string.js
@@ -5,5 +5,5 @@ function is_string (mixed_var) {
   // *     returns 1: true
   // *     example 2: is_string(23.5);
   // *     returns 2: false
-  return (typeof(mixed_var) == 'string');
+  return (typeof mixed_var === 'string');
 }
diff --git a/functions/xdiff/xdiff_string_patch.js b/functions/xdiff/xdiff_string_patch.js
@@ -172,7 +172,7 @@ function xdiff_string_patch (originalStr, patch, flags, error) {
 	  newStrArr[newStrArr.length] = origLines[linePos++];
 	}
   }
-  if (typeof(error) === 'string') {
+  if (typeof error === 'string') {
     this.window[error] = errors;
   }
   return newStrArr.join('\n');

Original file line number	Diff line number	Diff line change
`@@ -1118,7 +1118,7 @@ function _phpjs_shared_bc () {`
`1118`	`1118`	`},`
`1119`	`1119`
`1120`	`1120`	`cint: function (v) {`
`1121`		`- if (typeof(v) == 'undefined') {`
	`1121`	`+ if (typeof v === 'undefined') {`
`1122`	`1122`	`v = 0;`
`1123`	`1123`	`}`
`1124`	`1124`	`var x = parseInt(v, 10);`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@ function array_walk_recursive (array, funcname, userdata) {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`for (key in array) {`
`15`		`- if (typeof array[key] == 'object') {`
	`15`	`+ if (typeof array[key] === 'object') {`
`16`	`16`	`return this.array_walk_recursive(array[key], funcname, userdata);`
`17`	`17`	`}`
`18`	`18`
`19`		`- if (typeof(userdata) != 'undefined') {`
	`19`	`+ if (typeof userdata !== 'undefined') {`
`20`	`20`	`eval(funcname + '( array [key] , key , userdata )');`
`21`	`21`	`} else {`
`22`	`22`	`eval(funcname + '( userdata ) ');`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ function bcadd (left_operand, right_operand, scale) {`
`15`	`15`
`16`	`16`	`var first, second, result;`
`17`	`17`
`18`		`- if (typeof(scale) == 'undefined') {`
	`18`	`+ if (typeof scale === 'undefined') {`
`19`	`19`	`scale = libbcmath.scale;`
`20`	`20`	`}`
`21`	`21`	`scale = ((scale < 0) ? 0 : scale);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ function bccomp (left_operand, right_operand, scale) {`
`14`	`14`	`var libbcmath = this._phpjs_shared_bc();`
`15`	`15`
`16`	`16`	`var first, second; //bc_num`
`17`		`- if (typeof(scale) == 'undefined') {`
	`17`	`+ if (typeof scale === 'undefined') {`
`18`	`18`	`scale = libbcmath.scale;`
`19`	`19`	`}`
`20`	`20`	`scale = ((scale < 0) ? 0 : scale);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ function bcdiv (left_operand, right_operand, scale) {`
`20`	`20`
`21`	`21`	`var first, second, result;`
`22`	`22`
`23`		`- if (typeof(scale) == 'undefined') {`
	`23`	`+ if (typeof scale === 'undefined') {`
`24`	`24`	`scale = libbcmath.scale;`
`25`	`25`	`}`
`26`	`26`	`scale = ((scale < 0) ? 0 : scale);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ function bcmul (left_operand, right_operand, scale) {`
`16`	`16`
`17`	`17`	`var first, second, result;`
`18`	`18`
`19`		`- if (typeof(scale) == 'undefined') {`
	`19`	`+ if (typeof scale === 'undefined') {`
`20`	`20`	`scale = libbcmath.scale;`
`21`	`21`	`}`
`22`	`22`	`scale = ((scale < 0) ? 0 : scale);`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ function bcsub (left_operand, right_operand, scale) {`
`17`	`17`
`18`	`18`	`var first, second, result;`
`19`	`19`
`20`		`- if (typeof(scale) == 'undefined') {`
	`20`	`+ if (typeof scale === 'undefined') {`
`21`	`21`	`scale = libbcmath.scale;`
`22`	`22`	`}`
`23`	`23`	`scale = ((scale < 0) ? 0 : scale);`