More jslint-inspired fixes/changes

brettz9 · brettz9 · commit aec575aed7c4 · 2009-04-30T08:10:08.000Z
diff --git a/functions/array/asort.js b/functions/array/asort.js
@@ -34,10 +34,12 @@ function asort(inputArr, sort_flags) {
         case 'SORT_REGULAR': // compare items normally (don't change types)
         default:
             sorter = function (a, b) {
-                if (a > b)
+                if (a > b) {
                     return 1;
-                if (a < b)
+                }
+                if (a < b) {
                     return -1;
+                }
                 return 0;
             };
             break;
@@ -64,7 +66,7 @@ function asort(inputArr, sort_flags) {
     for (k in inputArr) {
         valArr.push(inputArr[k]);
         keyArr.push(k);
-        delete inputArr[k] ;
+        delete inputArr[k];
     }
     try {
         // Sort our new temporary arrays
diff --git a/functions/array/compact.js b/functions/array/compact.js
@@ -8,24 +8,23 @@ function compact ( ) {
     // *     example 1: compact('var1', 'var2', 'var3');
     // *     returns 1: {'var1': 'Kevin', 'var2': 'van', 'var3': 'Zonneveld'}    
     
-    var Matrix = {};
-    var key_value;
+    var matrix = {};
 
     var process = function ( value ) {
         var i = 0, l = value.length, key_value = '';
         for (i = 0; i < l; i++) {
             key_value = value [ i ];
             if (key_value instanceof Array) {
-                process ( key_value );
+                process( key_value );
             } else {
                 if (typeof window[key_value] !== 'undefined') {
-                    Matrix[key_value] = window[key_value];
+                    matrix[key_value] = window[key_value];
                 }
             }
         }
         return true;
     };
     
     process(arguments);
-    return Matrix;
+    return matrix;
 }
diff --git a/functions/array/current.js b/functions/array/current.js
@@ -6,8 +6,12 @@ function current(arr) {
     // *     example 1: current(transport); 
     // *     returns 1: 'foot'
 
-    if (!this.php_js) this.php_js = {};
-    if (!this.php_js.pointers) this.php_js.pointers = [];
+    if (!this.php_js) {
+        this.php_js = {};
+    }
+    if (!this.php_js.pointers) {
+        this.php_js.pointers = [];
+    }
     var pointers = this.php_js.pointers;
     if (pointers.indexOf(arr) === -1) {
         pointers.push(arr, 0);
diff --git a/functions/datetime/date.js b/functions/datetime/date.js
@@ -25,11 +25,11 @@ function date ( format, timestamp ) {
     // *     example 4: (x+'').length == 10
     // *     returns 4: true
 
-    var a, tal=[], jsdate=(
+    var jsdate=(
         (typeof(timestamp) == 'undefined') ? new Date() : // Not provided
         (typeof(timestamp) == 'number') ? new Date(timestamp*1000) : // UNIX timestamp
         new Date(timestamp) // Javascript Date()
-    );
+    ); // , tal=[]
     var pad = function(n, c){
         if( (n = n + "").length < c ) {
             return new Array(++c - n.length).join("0") + n;
@@ -173,10 +173,18 @@ function date ( format, timestamp ) {
                                  (jsdate.getMinutes() * 60) +
                                   jsdate.getSeconds() + off;
                 var beat = Math.floor(theSeconds/86.4);
-                if (beat > 1000) beat -= 1000;
-                if (beat < 0) beat += 1000;
-                if ((String(beat)).length == 1) beat = "00"+beat;
-                if ((String(beat)).length == 2) beat = "0"+beat;
+                if (beat > 1000) {
+                    beat -= 1000;
+                }
+                if (beat < 0) {
+                    beat += 1000;
+                }
+                if ((String(beat)).length == 1) {
+                    beat = "00"+beat;
+                }
+                if ((String(beat)).length == 2) {
+                    beat = "0"+beat;
+                }
                 return beat;
             },
             g: function(){
@@ -225,7 +233,7 @@ function date ( format, timestamp ) {
             },
             O: function(){
                var t = pad(Math.abs(jsdate.getTimezoneOffset()/60*100), 4);
-               if (jsdate.getTimezoneOffset() > 0) t = "-" + t; else t = "+" + t;
+               t = (jsdate.getTimezoneOffset() > 0) ? "-"+t : "+"+t;
                return t;
             },
             P: function(){
diff --git a/functions/datetime/date_default_timezone_get.js b/functions/datetime/date_default_timezone_get.js
@@ -12,15 +12,15 @@ function date_default_timezone_get () {
         if (this.php_js.default_timezone) { // set by date_default_timezone_set
             return this.php_js.default_timezone;
         }
-        if (this.php_js.ENV && this.php_js.ENV['TZ']) { // getenv
-            return this.php_js.ENV['TZ'];
+        if (this.php_js.ENV && this.php_js.ENV.TZ) { // getenv
+            return this.php_js.ENV.TZ;
         }
         if (this.php_js.ini && this.php_js.ini['date.timezone']) { // e.g., if set by ini_set()
-            return this.php_js.ini['date.timezone']['local_value'] ? this.php_js.ini['date.timezone']['local_value'] : this.php_js.ini['date.timezone']['global_value'];
+            return this.php_js.ini['date.timezone'].local_value ? this.php_js.ini['date.timezone'].local_value : this.php_js.ini['date.timezone'].global_value;
         }
     }
     // Get from system
-	tal = timezone_abbreviations_list();
+	tal = this.timezone_abbreviations_list();
 	for (abbr in tal) {
 		for (i=0; i < tal[abbr].length; i++) {
 			if (tal[abbr][i].offset === -today.getTimezoneOffset()*60) {
diff --git a/functions/datetime/date_default_timezone_set.js b/functions/datetime/date_default_timezone_set.js
@@ -12,7 +12,7 @@ function date_default_timezone_set (tz) {
 		this.php_js={};
 	}
 	// PHP verifies that the timezone is valid
-	tal = timezone_abbreviations_list();
+	tal = this.timezone_abbreviations_list();
 	for (abbr in tal) {
 		for (i=0; i < tal[abbr].length; i++) {
 			if (tal[abbr][i].timezone_id === tz) {
diff --git a/functions/math/decbin.js b/functions/math/decbin.js
@@ -9,5 +9,5 @@ function decbin(number) {
     // *     example 3: decbin('26');
     // *     returns 3: '11010'
     
-    return parseInt(number).toString(2);
+    return parseInt(number, 10).toString(2);
 }
diff --git a/functions/math/dechex.js b/functions/math/dechex.js
@@ -7,5 +7,5 @@ function dechex(number) {
     // *     example 2: dechex(47);
     // *     returns 2: '2f'
     
-    return parseInt(number).toString(16);
+    return parseInt(number, 10).toString(16);
 }
diff --git a/functions/math/decoct.js b/functions/math/decoct.js
@@ -7,5 +7,5 @@ function decoct(number) {
     // *     example 2: decoct(264); 
     // *     returns 2: '410'
     
-    return parseInt(number).toString(8);
+    return parseInt(number, 10).toString(8);
 }
diff --git a/functions/objaggregation/aggregate_methods_by_regexp.js b/functions/objaggregation/aggregate_methods_by_regexp.js
@@ -9,7 +9,7 @@ function aggregate_methods_by_regexp (obj, class_name, regexp, exclude) {
 	// *     example 1: aggregate_methods_by_regexp(b, 'A', /^meth/, false);
 	// *     returns 1: undefined
 
-    var p = '', i=0, test=false, record={}, pos=-1;
+    var p = '', test=false, record={}, pos=-1;
 
     if (typeof regexp === 'string') { // If passing the regular expression as a string, note that this behavior may change in the future as we seek to implement PHP-style regexp (e.g., delimiteres and modifier flags within the string)
         regexp = eval(regexp);
diff --git a/functions/objaggregation/aggregate_properties_by_regexp.js b/functions/objaggregation/aggregate_properties_by_regexp.js
@@ -9,7 +9,7 @@ function aggregate_properties_by_regexp (obj, class_name, regexp, exclude) {
 	// *     example 1: aggregate_properties_by_regexp(b, 'A', /^pr/, false);
 	// *     returns 1: undefined
 
-    var p = '', i=0, test=false, record={}, pos=-1;
+    var p = '', test=false, record={}, pos=-1;
 
     if (typeof regexp === 'string') { // If passing the regular expression as a string, note that this behavior may change in the future as we seek to implement PHP-style regexp (e.g., delimiteres and modifier flags within the string)
         regexp = eval(regexp);
diff --git a/functions/objaggregation/deaggregate.js b/functions/objaggregation/deaggregate.js
@@ -15,7 +15,7 @@ function deaggregate (obj, class_name) {
         return;
     }
 
-    idx = this.php_js.aggregateKeys.indexOf(obj)
+    idx = this.php_js.aggregateKeys.indexOf(obj);
     if (idx === -1) {
         return;
     }
diff --git a/functions/strings/chunk_split.js b/functions/strings/chunk_split.js
@@ -8,12 +8,12 @@ function chunk_split(body, argChunklen, argEnd) {
     // *     example 2: chunk_split('Hello world!', 10, '*');
     // *     returns 2: 'Hello worl*d!*'
     
+    var result = '', chunklen = argChunklen || 76, end = argEnd || '\r\n';
+
     if (chunklen < 1) {
         return false;
     }
 
-    var result = '', chunklen = argChunklen || 76, end = argEnd || '\r\n';
-
     while (body.length > chunklen) {
         result += body.substring(0, chunklen) + end;
         body = body.substring(chunklen);

Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,15 @@ function date_default_timezone_get () {`
`12`	`12`	`if (this.php_js.default_timezone) { // set by date_default_timezone_set`
`13`	`13`	`return this.php_js.default_timezone;`
`14`	`14`	`}`
`15`		`- if (this.php_js.ENV && this.php_js.ENV['TZ']) { // getenv`
`16`		`- return this.php_js.ENV['TZ'];`
	`15`	`+ if (this.php_js.ENV && this.php_js.ENV.TZ) { // getenv`
	`16`	`+ return this.php_js.ENV.TZ;`
`17`	`17`	`}`
`18`	`18`	`if (this.php_js.ini && this.php_js.ini['date.timezone']) { // e.g., if set by ini_set()`
`19`		`- return this.php_js.ini['date.timezone']['local_value'] ? this.php_js.ini['date.timezone']['local_value'] : this.php_js.ini['date.timezone']['global_value'];`
	`19`	`+ return this.php_js.ini['date.timezone'].local_value ? this.php_js.ini['date.timezone'].local_value : this.php_js.ini['date.timezone'].global_value;`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`// Get from system`
`23`		`- tal = timezone_abbreviations_list();`
	`23`	`+ tal = this.timezone_abbreviations_list();`
`24`	`24`	`for (abbr in tal) {`
`25`	`25`	`for (i=0; i < tal[abbr].length; i++) {`
`26`	`26`	`if (tal[abbr][i].offset === -today.getTimezoneOffset()*60) {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ function date_default_timezone_set (tz) {`
`12`	`12`	`this.php_js={};`
`13`	`13`	`}`
`14`	`14`	`// PHP verifies that the timezone is valid`
`15`		`- tal = timezone_abbreviations_list();`
	`15`	`+ tal = this.timezone_abbreviations_list();`
`16`	`16`	`for (abbr in tal) {`
`17`	`17`	`for (i=0; i < tal[abbr].length; i++) {`
`18`	`18`	`if (tal[abbr][i].timezone_id === tz) {`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ function decbin(number) {`
`9`	`9`	`// * example 3: decbin('26');`
`10`	`10`	`// * returns 3: '11010'`
`11`	`11`
`12`		`- return parseInt(number).toString(2);`
	`12`	`+ return parseInt(number, 10).toString(2);`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ function dechex(number) {`
`7`	`7`	`// * example 2: dechex(47);`
`8`	`8`	`// * returns 2: '2f'`
`9`	`9`
`10`		`- return parseInt(number).toString(16);`
	`10`	`+ return parseInt(number, 10).toString(16);`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ function decoct(number) {`
`7`	`7`	`// * example 2: decoct(264);`
`8`	`8`	`// * returns 2: '410'`
`9`	`9`
`10`		`- return parseInt(number).toString(8);`
	`10`	`+ return parseInt(number, 10).toString(8);`
`11`	`11`	`}`