more jslint fixes

brettz9 · brettz9 · commit cacbf437658d · 2009-04-30T14:36:00.000Z
diff --git a/functions/array/end.js b/functions/array/end.js
@@ -12,8 +12,12 @@ function end ( arr ) {
     // *     example 2: end(['Kevin', 'van', 'Zonneveld']);
     // *     returns 2: 'Zonneveld'
     
-    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/array/key.js b/functions/array/key.js
@@ -6,9 +6,12 @@ function key(arr) {
     // *     example 1: key(array);
     // *     returns 1: 'fruit1'
 
-    if (!this.php_js) 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/array/krsort.js b/functions/array/krsort.js
@@ -9,12 +9,12 @@ function krsort(array, sort_flags) {
     // *     results 1: data == {3: 'Kevin', 2: 'van', 1: 'Zonneveld'}
     // *     returns 1: true
 
-    var tmp_arr={}, keys=[], sorter, i, key;
+    var tmp_arr={}, keys=[], sorter, i, key, that=this;
 
     switch (sort_flags) {
         case 'SORT_STRING': // compare items as strings
             sorter = function (a, b) {
-                return strnatcmp(b, a);
+                return that.strnatcmp(b, a);
             };
             break;
         case 'SORT_LOCALE_STRING': // compare items as strings, based on the current locale (set with  i18n_loc_set_default() as of PHP6)
@@ -30,10 +30,12 @@ function krsort(array, 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;
@@ -53,7 +55,7 @@ function krsort(array, sort_flags) {
         delete array[key];
     }
     for (i in tmp_arr) {
-        array[i] = tmp_arr[i]
+        array[i] = tmp_arr[i];
     }
 
     return true;
diff --git a/functions/array/ksort.js b/functions/array/ksort.js
@@ -9,12 +9,12 @@ function ksort(array, sort_flags) {
     // *     results 1: data == {1: 'Kevin', 2: 'van', 3: 'Zonneveld'}
     // *     returns 1: true
 
-    var tmp_arr={}, keys=[], sorter, i, key;
+    var tmp_arr={}, keys=[], sorter, i, key, that=this;
 
     switch (sort_flags) {
         case 'SORT_STRING': // compare items as strings
             sorter = function (a, b) {
-                return strnatcmp(a, b);
+                return that.strnatcmp(a, b);
             };
             break;
         case 'SORT_LOCALE_STRING': // compare items as strings, based on the current locale (set with  i18n_loc_set_default() as of PHP6)
@@ -30,10 +30,12 @@ function ksort(array, 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;
diff --git a/functions/classobj/get_class.js b/functions/classobj/get_class.js
@@ -15,9 +15,9 @@ function get_class(obj) {
     // *     example 6: get_class(function MyFunction() {});
     // *     returns 6: false
 
-    if (obj instanceof Object && !(obj instanceof Array) 
-        && !(obj instanceof Function) && obj.constructor
-        && obj != window) {
+    if (obj instanceof Object && !(obj instanceof Array) && 
+        !(obj instanceof Function) && obj.constructor &&
+        obj != window) {
         var arr = obj.constructor.toString().match(/function\s*(\w+)/);
 
         if (arr && arr.length == 2) {
diff --git a/functions/classobj/get_declared_classes.js b/functions/classobj/get_declared_classes.js
@@ -16,13 +16,13 @@ function get_declared_classes() {
     for (i in window) {
         try {
             if (typeof window[i] === 'function') {
-                if (!already[i] && class_exists(i)) {
+                if (!already[i] && this.class_exists(i)) {
                     already[i] = 1;
                     arr.push(i);
                 }
             } else if (typeof window[i] === 'object') {
                 for (j in window[i]) {
-                    if (typeof window[j] === 'function' && window[j] && !already[j] && class_exists(j)) {
+                    if (typeof window[j] === 'function' && window[j] && !already[j] && this.class_exists(j)) {
                         already[j] = 1;
                         arr.push(j);
                     }
diff --git a/functions/datetime/getdate.js b/functions/datetime/getdate.js
@@ -22,7 +22,7 @@ function getdate(timestamp) {
     r['yday'] = Math.floor((d - (new Date(y, 0, 1))) / 86400000);
     r['weekday'] = _w[w];
     r['month'] = _m[m];
-    r['0'] = parseInt(d.getTime() / 1000);
+    r['0'] = parseInt(d.getTime() / 1000, 10);
 
     return r;
 }
diff --git a/functions/datetime/gmdate.js b/functions/datetime/gmdate.js
@@ -8,5 +8,5 @@ function gmdate (format, timestamp) {
         (typeof(timestamp) == 'number') ? new Date(timestamp*1000) : // UNIX timestamp
         new Date(timestamp));
     timestamp = Date.parse(dt.toUTCString().slice(0, -4))/1000;
-    return date(format, timestamp);
+    return this.date(format, timestamp);
 }
diff --git a/functions/datetime/gmmktime.js b/functions/datetime/gmmktime.js
@@ -11,7 +11,7 @@ function gmmktime() {
         0: function(tt){ return d.setUTCHours(tt); },
         1: function(tt){ return d.setUTCMinutes(tt); },
         2: function(tt){ var set = d.setUTCSeconds(tt); mb = d.getUTCDate() - dn.getUTCDate(); return set;},
-        3: function(tt){ var set = d.setUTCMonth(parseInt(tt)-1); ma = d.getUTCFullYear() - dn.getUTCFullYear(); return set;},
+        3: function(tt){ var set = d.setUTCMonth(parseInt(tt, 10)-1); ma = d.getUTCFullYear() - dn.getUTCFullYear(); return set;},
         4: function(tt){ return d.setUTCDate(tt+mb);},
         5: function(tt){
             if (tt >= 0 && tt <= 69) {
@@ -26,7 +26,7 @@ function gmmktime() {
     };
 
     for( i = 0; i < argc; i++ ){
-        no = parseInt(argv[i]*1);
+        no = parseInt(argv[i]*1, 10);
         if (isNaN(no)) {
             return false;
         } else {
diff --git a/functions/datetime/gmstrftime.js b/functions/datetime/gmstrftime.js
@@ -8,5 +8,5 @@ function gmstrftime (format, timestamp) {
         (typeof(timestamp) == 'number') ? new Date(timestamp*1000) : // UNIX timestamp
         new Date(timestamp));
     timestamp = Date.parse(dt.toUTCString().slice(0, -4))/1000;
-    return strftime(format, timestamp);
+    return this.strftime(format, timestamp);
 }
diff --git a/functions/filesystem/fopen.js b/functions/filesystem/fopen.js
@@ -9,14 +9,16 @@ function fopen (filename, mode, use_include_path, context) {
     // BEGIN file inclusion: file_get_contents
     var file_get_contents = function ( url ) {
         var req = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
-        if (!req) throw new Error('XMLHttpRequest not supported');
+        if (!req) {
+            throw new Error('XMLHttpRequest not supported');
+        }
         if (!/^http/.test(url)) { // Allow references within or below the same directory (should fix to allow other relative references or root reference; could make dependent on parse_url())
             url = window.location.href + '/' +url;
         }
         req.open("GET", url, false);
         req.send(null);
         return req.responseText;
-    }
+    };
     // END file inclusion
 
     if (use_include_path === 1 || use_include_path === '1' || use_include_path === true) { 
@@ -41,7 +43,6 @@ function fopen (filename, mode, use_include_path, context) {
                 throw 'Windows-only modes are not supported';
             default:
                 throw 'Unrecognized file mode passed to '+arguments.caller.name+'()';
-                break;
         }
     }
 
diff --git a/functions/filesystem/fseek.js b/functions/filesystem/fseek.js
@@ -23,7 +23,6 @@ function fseek (handle, offset, whence) {
             break;
         default:
             throw 'Unrecognized whence value for fseek()';
-            break;
     }
     return 0;
 }
diff --git a/functions/funchand/func_get_arg.js b/functions/funchand/func_get_arg.js
@@ -9,7 +9,7 @@ function func_get_arg(num) {
     if (!arguments.callee.caller) {
         try {
             throw new Error('Either you are using this in a browser which does not support the "caller" property or you are calling this from a global context');
-            return false;
+            //return false;
         } catch(e){
             return false;
         }
@@ -18,7 +18,7 @@ function func_get_arg(num) {
     if (num > arguments.callee.caller.arguments.length - 1) {
         try {
             throw new Error('Argument number is greater than the number of arguments actually passed');
-            return false;
+            //return false;
         } catch(e){
             return false;
         }
diff --git a/functions/funchand/func_get_args.js b/functions/funchand/func_get_args.js
@@ -9,7 +9,7 @@ function func_get_args() {
     if (!arguments.callee.caller) {
         try {
             throw new Error('Either you are using this in a browser which does not support the "caller" property or you are calling this from a global context');
-            return false;
+            // return false;
         } catch(e){
             return false;
         }
diff --git a/functions/funchand/func_num_args.js b/functions/funchand/func_num_args.js
@@ -9,7 +9,7 @@ function func_num_args() {
     if (!arguments.callee.caller) {
         try {
             throw new Error('Either you are using this in a browser which does not support the "caller" property or you are calling this from a global context');
-            return false;
+            //return false;
         } catch(e){
             return false;
         }
diff --git a/functions/info/get_included_files.js b/functions/info/get_included_files.js
@@ -7,8 +7,12 @@ function get_included_files() {
 
     var cur_file = {};
     cur_file[window.location.href] = 1;
-    if(!this.php_js) this.php_js = {};
-    if(!this.php_js.includes) this.php_js.includes = cur_file;
+    if(!this.php_js) {
+        this.php_js = {};
+    }
+    if(!this.php_js.includes) {
+        this.php_js.includes = cur_file;
+    }
 
     var includes = [];
     var i = 0;
diff --git a/functions/info/get_required_files.js b/functions/info/get_required_files.js
@@ -4,5 +4,5 @@ function get_required_files () {
     // -    depends on: get_included_files
     // *     example 1: get_required_files();
     // *     returns 1: ['http://kevin.vanzonneveld.net/pj_tester.php']
-    return get_included_files();
+    return this.get_included_files();
 }
diff --git a/functions/info/ini_alter.js b/functions/info/ini_alter.js
@@ -4,5 +4,5 @@ function ini_alter (varname, newvalue) {
     // -    depends on: ini_set
     // *     example 1: ini_alter('date.timezone', 'America/Chicago');
     // *     returns 1: 'Asia/Hong_Kong'
-	return ini_set(varname, newvalue);
+	return this.ini_set(varname, newvalue);
 }
diff --git a/functions/json/json_decode.js b/functions/json/json_decode.js
@@ -34,7 +34,7 @@ function json_decode(str_json) {
             }
         }
         return reviver.call(holder, key, value);
-    }
+    };
 
     // Parsing happens in four stages. In the first stage, we replace certain
     // Unicode characters with escape sequences. JavaScript handles many characters
diff --git a/functions/json/json_encode.js b/functions/json/json_encode.js
@@ -37,7 +37,7 @@ function json_encode(mixed_val) {
             '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
         }) + '"' :
         '"' + string + '"';
-    }
+    };
 
     var str = function(key, holder) {
         var gap = '';
diff --git a/functions/language/include.js b/functions/language/include.js
@@ -22,8 +22,12 @@ function include( filename ) {
     var cur_file = {};
     cur_file[window.location.href] = 1;
 
-    if (!this.php_js) this.php_js = {};
-    if (!this.php_js.includes) this.php_js.includes = cur_file;
+    if (!this.php_js) {
+        this.php_js = {};
+    }
+    if (!this.php_js.includes) {
+        this.php_js.includes = cur_file;
+    }
     if (!this.php_js.includes[filename]) {
         this.php_js.includes[filename] = 1;
     } else {
diff --git a/functions/language/include_once.js b/functions/language/include_once.js
@@ -13,10 +13,14 @@ function include_once( filename ) {
     var cur_file = {};
     cur_file[window.location.href] = 1;
 
-    if (!this.php_js) this.php_js = {};
-    if (!this.php_js.includes) this.php_js.includes = cur_file;
+    if (!this.php_js) {
+        this.php_js = {};
+    }
+    if (!this.php_js.includes) {
+        this.php_js.includes = cur_file;
+    }
     if (!this.php_js.includes[filename]) {
-        if(include(filename)){
+        if(this.include(filename)){
             return true;
         }
     } else{
diff --git a/functions/math/fmod.js b/functions/math/fmod.js
@@ -9,9 +9,9 @@ function fmod(x, y) {
     var tmp, tmp2, p = 0, pY = 0, l = 0.0, l2 = 0.0;
     
     tmp = x.toExponential().match(/^.\.?(.*)e(.+)$/);
-    p = parseInt(tmp[2])-(tmp[1]+'').length;
+    p = parseInt(tmp[2], 10)-(tmp[1]+'').length;
     tmp = y.toExponential().match(/^.\.?(.*)e(.+)$/);
-    pY = parseInt(tmp[2])-(tmp[1]+'').length;
+    pY = parseInt(tmp[2], 10)-(tmp[1]+'').length;
     
     if (pY > p) {
         p = pY;
diff --git a/functions/strings/explode.js b/functions/strings/explode.js
@@ -13,24 +13,24 @@ function explode( delimiter, string, limit ) {
     var emptyArray = { 0: '' };
     
     // third argument is not required
-    if ( arguments.length < 2
-        || typeof arguments[0] == 'undefined'
-        || typeof arguments[1] == 'undefined' )
+    if ( arguments.length < 2 ||
+        typeof arguments[0] == 'undefined' ||
+        typeof arguments[1] == 'undefined' )
     {
         return null;
     }
  
-    if ( delimiter === ''
-        || delimiter === false
-        || delimiter === null )
+    if ( delimiter === '' ||
+        delimiter === false ||
+        delimiter === null )
     {
         return false;
     }
  
-    if ( typeof delimiter == 'function'
-        || typeof delimiter == 'object'
-        || typeof string == 'function'
-        || typeof string == 'object' )
+    if ( typeof delimiter == 'function' ||
+        typeof delimiter == 'object' ||
+        typeof string == 'function' ||
+        typeof string == 'object' )
     {
         return emptyArray;
     }
diff --git a/functions/strings/get_html_translation_table.js b/functions/strings/get_html_translation_table.js
@@ -31,6 +31,7 @@ function get_html_translation_table(table, quote_style) {
 
     if (useTable !== 'HTML_SPECIALCHARS' && useTable !== 'HTML_ENTITIES') {
         throw Error("Table: "+useTable+' not supported');
+        // return false;
     }
 
     // ascii decimals for better compatibility
diff --git a/functions/strings/implode.js b/functions/strings/implode.js
@@ -5,5 +5,5 @@ function implode( glue, pieces ) {
     // *     example 1: implode(' ', ['Kevin', 'van', 'Zonneveld']);
     // *     returns 1: 'Kevin van Zonneveld'
 
-    return ( ( pieces instanceof Array ) ? pieces.join ( glue ) : pieces );
+    return ( ( pieces instanceof Array ) ? pieces.join( glue ) : pieces );
 }
diff --git a/functions/strings/md5_file.js b/functions/strings/md5_file.js
@@ -10,7 +10,7 @@ function md5_file ( str_filename ) {
 
     var buf = '';
 
-    buf = file_get_contents(str_filename);
+    buf = this.file_get_contents(str_filename);
     
     if (!buf) {
         return false;
diff --git a/functions/url/get_headers.js b/functions/url/get_headers.js
diff --git a/functions/url/get_meta_tags.js b/functions/url/get_meta_tags.js
diff --git a/functions/url/http_build_query.js b/functions/url/http_build_query.js
diff --git a/functions/var/empty.js b/functions/var/empty.js
diff --git a/functions/var/gettype.js b/functions/var/gettype.js
diff --git a/functions/var/intval.js b/functions/var/intval.js
diff --git a/functions/var/is_double.js b/functions/var/is_double.js
diff --git a/functions/var/is_float.js b/functions/var/is_float.js
diff --git a/functions/var/is_int.js b/functions/var/is_int.js
diff --git a/functions/var/is_scalar.js b/functions/var/is_scalar.js
diff --git a/functions/var/is_unicode.js b/functions/var/is_unicode.js

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ function getdate(timestamp) {`
`22`	`22`	`r['yday'] = Math.floor((d - (new Date(y, 0, 1))) / 86400000);`
`23`	`23`	`r['weekday'] = _w[w];`
`24`	`24`	`r['month'] = _m[m];`
`25`		`- r['0'] = parseInt(d.getTime() / 1000);`
	`25`	`+ r['0'] = parseInt(d.getTime() / 1000, 10);`
`26`	`26`
`27`	`27`	`return r;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ function gmdate (format, timestamp) {`
`8`	`8`	`(typeof(timestamp) == 'number') ? new Date(timestamp*1000) : // UNIX timestamp`
`9`	`9`	`new Date(timestamp));`
`10`	`10`	`timestamp = Date.parse(dt.toUTCString().slice(0, -4))/1000;`
`11`		`- return date(format, timestamp);`
	`11`	`+ return this.date(format, timestamp);`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ function gmstrftime (format, timestamp) {`
`8`	`8`	`(typeof(timestamp) == 'number') ? new Date(timestamp*1000) : // UNIX timestamp`
`9`	`9`	`new Date(timestamp));`
`10`	`10`	`timestamp = Date.parse(dt.toUTCString().slice(0, -4))/1000;`
`11`		`- return strftime(format, timestamp);`
	`11`	`+ return this.strftime(format, timestamp);`
`12`	`12`	`}`