From 6f4673f59050908ca515f48e9b8b3616b296067e Mon Sep 17 00:00:00 2001 From: paulb777 Date: Wed, 2 Feb 2011 08:46:19 -0800 Subject: [PATCH] JSLint clean JavaScript sources. No fatal errors remain. Options can turn off rest of warnings --- example/main.js | 221 +++++++++++++-------------- framework/assets/js/accelerometer.js | 20 +-- framework/assets/js/app.js | 25 ++- framework/assets/js/camera.js | 10 +- framework/assets/js/compass.js | 16 +- framework/assets/js/contact.js | 117 +++++++------- framework/assets/js/crypto.js | 4 +- framework/assets/js/device.js | 10 +- framework/assets/js/file.js | 179 +++++++++++----------- framework/assets/js/filetransfer.js | 8 +- framework/assets/js/geolocation.js | 36 ++--- framework/assets/js/keyevent.js | 2 +- framework/assets/js/media.js | 20 +-- framework/assets/js/network.js | 8 +- framework/assets/js/notification.js | 4 +- framework/assets/js/phonegap.js.base | 220 +++++++++++++------------- framework/assets/js/position.js | 4 +- framework/assets/js/storage.js | 70 +++++---- 18 files changed, 503 insertions(+), 471 deletions(-) diff --git a/example/main.js b/example/main.js index 31e70c04..32ea9be9 100644 --- a/example/main.js +++ b/example/main.js @@ -1,127 +1,120 @@ - var deviceInfo = function(){ - document.getElementById("platform").innerHTML = device.platform; - document.getElementById("version").innerHTML = device.version; - document.getElementById("uuid").innerHTML = device.uuid; - document.getElementById("name").innerHTML = device.name; - document.getElementById("width").innerHTML = screen.width; - document.getElementById("height").innerHTML = screen.height; - document.getElementById("colorDepth").innerHTML = screen.colorDepth; +var deviceInfo = function() { + document.getElementById("platform").innerHTML = device.platform; + document.getElementById("version").innerHTML = device.version; + document.getElementById("uuid").innerHTML = device.uuid; + document.getElementById("name").innerHTML = device.name; + document.getElementById("width").innerHTML = screen.width; + document.getElementById("height").innerHTML = screen.height; + document.getElementById("colorDepth").innerHTML = screen.colorDepth; +}; + +var getLocation = function() { + var suc = function(p) { + alert(p.coords.latitude + " " + p.coords.longitude); }; - - var getLocation = function() { - var suc = function(p){ - alert(p.coords.latitude + " " + p.coords.longitude); - }; - var fail = function(){}; - navigator.geolocation.getCurrentPosition(suc,fail); + var locFail = function() { }; - - var beep = function(){ - navigator.notification.beep(2); - }; - - var vibrate = function(){ - navigator.notification.vibrate(0); - }; + navigator.geolocation.getCurrentPosition(suc, locFail); +}; - function roundNumber(num) { - var dec = 3; - var result = Math.round(num*Math.pow(10,dec))/Math.pow(10,dec); - return result; +var beep = function() { + navigator.notification.beep(2); +}; + +var vibrate = function() { + navigator.notification.vibrate(0); +}; + +function roundNumber(num) { + var dec = 3; + var result = Math.round(num * Math.pow(10, dec)) / Math.pow(10, dec); + return result; +} + +var accelerationWatch = false; + +function updateAcceleration(a) { + document.getElementById('x').innerHTML = roundNumber(a.x); + document.getElementById('y').innerHTML = roundNumber(a.y); + document.getElementById('z').innerHTML = roundNumber(a.z); +} + +var toggleAccel = function() { + if (accelerationWatch) { + navigator.accelerometer.clearWatch(accelerationWatch); + updateAcceleration({ + x : "", + y : "", + z : "" + }); + accelerationWatch = false; + } else { + accelerationWatch = true; + var options = {}; + options.frequency = 1000; + accelerationWatch = navigator.accelerometer.watchAcceleration( + updateAcceleration, function(ex) { + navigator.accelerometer.clearWatch(accel_watch_id); + alert("accel fail (" + ex.name + ": " + ex.message + ")"); + }, options); } - - var accelerationWatch = false; - - var toggleAccel = function() { - if (accelerationWatch) { - navigator.accelerometer.clearWatch(accelerationWatch); - updateAcceleration( { - x : "", - y : "", - z : "" - }); - accelerationWatch = false; - } else { - accelerationWatch = true; - var options = new Object(); - options.frequency = 1000; - accelerationWatch = navigator.accelerometer.watchAcceleration( - updateAcceleration, function(ex) { - navigator.accelerometer.clearWatch(accel_watch_id); - alert("accel fail (" + ex.name + ": " + ex.message + ")"); - }, options); - } - }; +}; - function updateAcceleration(a) { - document.getElementById('x').innerHTML = roundNumber(a.x); - document.getElementById('y').innerHTML = roundNumber(a.y); - document.getElementById('z').innerHTML = roundNumber(a.z); - } - - var preventBehavior = function(e) { - e.preventDefault(); - }; +var preventBehavior = function(e) { + e.preventDefault(); +}; - function show_pic() - { - var viewport = document.getElementById('viewport'); - viewport.style.display = ""; - navigator.camera.getPicture(dump_pic, fail, { quality: 50 }); - } +function dump_pic(data) { + var viewport = document.getElementById('viewport'); + console.log(data); + viewport.style.display = ""; + viewport.style.position = "absolute"; + viewport.style.top = "10px"; + viewport.style.left = "10px"; + document.getElementById("test_img").src = "data:image/jpeg;base64," + data; +} - function dump_pic(data) - { - var viewport = document.getElementById('viewport'); - console.log(data); - viewport.style.display = ""; - viewport.style.position = "absolute"; - viewport.style.top = "10px"; - viewport.style.left = "10px"; - document.getElementById("test_img").src = "data:image/jpeg;base64," + data; - } +function fail(msg) { + alert(msg); +} - function close() - { - var viewport = document.getElementById('viewport'); - viewport.style.position = "relative"; - viewport.style.display = "none"; - } +function show_pic() { + var viewport = document.getElementById('viewport'); + viewport.style.display = ""; + navigator.camera.getPicture(dump_pic, fail, { quality : 50 }); +} - function fail(fail) - { - alert(fail); - } +function close() { + var viewport = document.getElementById('viewport'); + viewport.style.position = "relative"; + viewport.style.display = "none"; +} - // This is just to do this. - function readFile() - { - navigator.file.read('/sdcard/phonegap.txt', fail , fail); - } +// This is just to do this. +function readFile() { + navigator.file.read('/sdcard/phonegap.txt', fail, fail); +} - function writeFile() - { - navigator.file.write('foo.txt', "This is a test of writing to a file", fail, fail); - } +function writeFile() { + navigator.file.write('foo.txt', "This is a test of writing to a file", fail, fail); +} - function get_contacts() - { - var obj = new ContactFindOptions(); - obj.filter=""; - obj.multiple=true; - obj.limit=5; - navigator.service.contacts.find(["displayName", "phoneNumbers", "emails"], contacts_success, fail, obj); - } +function contacts_success(contacts) { + alert(contacts.length + ' contacts returned.' + (contacts[2] ? + (' Third contact is ' + contacts[2].displayName) : '')); +} - function contacts_success(contacts) - { - alert(contacts.length + ' contacts returned.' + - (contacts[2] ? (' Third contact is ' + contacts[2].displayName) : '')); - } - - - function init(){ - //the next line makes it impossible to see Contacts on the HTC Evo since it doesn't have a scroll button -// document.addEventListener("touchmove", preventBehavior, false); - document.addEventListener("deviceready", deviceInfo, true); - } +function get_contacts() { + var obj = new ContactFindOptions(); + obj.filter = ""; + obj.multiple = true; + obj.limit = 5; + navigator.service.contacts.find( + [ "displayName", "phoneNumbers", "emails" ], contacts_success, fail, obj); +} + +function init() { + //the next line makes it impossible to see Contacts on the HTC Evo since it doesn't have a scroll button + // document.addEventListener("touchmove", preventBehavior, false); + document.addEventListener("deviceready", deviceInfo, true); +} diff --git a/framework/assets/js/accelerometer.js b/framework/assets/js/accelerometer.js index 89258011..2368b596 100755 --- a/framework/assets/js/accelerometer.js +++ b/framework/assets/js/accelerometer.js @@ -11,7 +11,7 @@ function Acceleration(x, y, z) { this.y = y; this.z = z; this.timestamp = new Date().getTime(); -}; +} /** * This class provides access to device accelerometer data. @@ -28,7 +28,7 @@ function Accelerometer() { * List of accelerometer watch timers */ this.timers = {}; -}; +} Accelerometer.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"]; @@ -42,13 +42,13 @@ Accelerometer.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"]; Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) { // successCallback required - if (typeof successCallback != "function") { + if (typeof successCallback !== "function") { console.log("Accelerometer Error: successCallback is not a function"); return; } // errorCallback optional - if (errorCallback && (typeof errorCallback != "function")) { + if (errorCallback && (typeof errorCallback !== "function")) { console.log("Accelerometer Error: errorCallback is not a function"); return; } @@ -68,16 +68,16 @@ Accelerometer.prototype.getCurrentAcceleration = function(successCallback, error Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) { // Default interval (10 sec) - var frequency = (options != undefined)? options.frequency : 10000; + var frequency = (options !== undefined)? options.frequency : 10000; // successCallback required - if (typeof successCallback != "function") { + if (typeof successCallback !== "function") { console.log("Accelerometer Error: successCallback is not a function"); return; } // errorCallback optional - if (errorCallback && (typeof errorCallback != "function")) { + if (errorCallback && (typeof errorCallback !== "function")) { console.log("Accelerometer Error: errorCallback is not a function"); return; } @@ -108,12 +108,14 @@ Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallb Accelerometer.prototype.clearWatch = function(id) { // Stop javascript timer & remove from timer list - if (id && navigator.accelerometer.timers[id] != undefined) { + if (id && navigator.accelerometer.timers[id] !== undefined) { clearInterval(navigator.accelerometer.timers[id]); delete navigator.accelerometer.timers[id]; } }; PhoneGap.addConstructor(function() { - if (typeof navigator.accelerometer == "undefined") navigator.accelerometer = new Accelerometer(); + if (typeof navigator.accelerometer === "undefined") { + navigator.accelerometer = new Accelerometer(); + } }); diff --git a/framework/assets/js/app.js b/framework/assets/js/app.js index 0d4978ad..6ee03256 100755 --- a/framework/assets/js/app.js +++ b/framework/assets/js/app.js @@ -9,8 +9,7 @@ /** * Constructor */ -function App() { -} +function App() {} /** * Clear the resource cache. @@ -22,19 +21,19 @@ App.prototype.clearCache = function() { /** * Load the url into the webview. * - * @param url The URL to load - * @param props Properties that can be passed in to the activity: - * wait: int => wait msec before loading URL - * loadingDialog: "Title,Message" => display a native loading dialog - * hideLoadingDialogOnPage: boolean => hide loadingDialog when page loaded instead of when deviceready event occurs. - * loadInWebView: boolean => cause all links on web page to be loaded into existing web view, instead of being loaded into new browser. - * loadUrlTimeoutValue: int => time in msec to wait before triggering a timeout error - * errorUrl: URL => URL to load if there's an error loading specified URL with loadUrl(). Should be a local URL such as file:///android_asset/www/error.html"); - * keepRunning: boolean => enable app to keep running in background + * @param url The URL to load + * @param props Properties that can be passed in to the activity: + * wait: int => wait msec before loading URL + * loadingDialog: "Title,Message" => display a native loading dialog + * hideLoadingDialogOnPage: boolean => hide loadingDialog when page loaded instead of when deviceready event occurs. + * loadInWebView: boolean => cause all links on web page to be loaded into existing web view, instead of being loaded into new browser. + * loadUrlTimeoutValue: int => time in msec to wait before triggering a timeout error + * errorUrl: URL => URL to load if there's an error loading specified URL with loadUrl(). Should be a local URL such as file:///android_asset/www/error.html"); + * keepRunning: boolean => enable app to keep running in background * * Example: - * App app = new App(); - * app.loadUrl("http://server/myapp/index.html", {wait:2000, loadingDialog:"Wait,Loading App", loadUrlTimeoutValue: 60000}); + * App app = new App(); + * app.loadUrl("http://server/myapp/index.html", {wait:2000, loadingDialog:"Wait,Loading App", loadUrlTimeoutValue: 60000}); */ App.prototype.loadUrl = function(url, props) { PhoneGap.exec(null, null, "App", "loadUrl", [url, props]); diff --git a/framework/assets/js/camera.js b/framework/assets/js/camera.js index 0d9cf761..1e4a75a6 100755 --- a/framework/assets/js/camera.js +++ b/framework/assets/js/camera.js @@ -59,13 +59,13 @@ Camera.prototype.PictureSourceType = Camera.PictureSourceType; Camera.prototype.getPicture = function(successCallback, errorCallback, options) { // successCallback required - if (typeof successCallback != "function") { + if (typeof successCallback !== "function") { console.log("Camera Error: successCallback is not a function"); return; } // errorCallback optional - if (errorCallback && (typeof errorCallback != "function")) { + if (errorCallback && (typeof errorCallback !== "function")) { console.log("Camera Error: errorCallback is not a function"); return; } @@ -80,12 +80,14 @@ Camera.prototype.getPicture = function(successCallback, errorCallback, options) destinationType = this.options.destinationType; } var sourceType = Camera.PictureSourceType.CAMERA; - if (typeof this.options.sourceType == "number") { + if (typeof this.options.sourceType === "number") { sourceType = this.options.sourceType; } PhoneGap.exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType]); }; PhoneGap.addConstructor(function() { - if (typeof navigator.camera == "undefined") navigator.camera = new Camera(); + if (typeof navigator.camera === "undefined") { + navigator.camera = new Camera(); + } }); diff --git a/framework/assets/js/compass.js b/framework/assets/js/compass.js index eefff79f..ffb16463 100755 --- a/framework/assets/js/compass.js +++ b/framework/assets/js/compass.js @@ -20,7 +20,7 @@ function Compass() { * List of compass watch timers */ this.timers = {}; -}; +} Compass.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"]; @@ -34,13 +34,13 @@ Compass.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"]; Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) { // successCallback required - if (typeof successCallback != "function") { + if (typeof successCallback !== "function") { console.log("Compass Error: successCallback is not a function"); return; } // errorCallback optional - if (errorCallback && (typeof errorCallback != "function")) { + if (errorCallback && (typeof errorCallback !== "function")) { console.log("Compass Error: errorCallback is not a function"); return; } @@ -60,16 +60,16 @@ Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, o Compass.prototype.watchHeading= function(successCallback, errorCallback, options) { // Default interval (100 msec) - var frequency = (options != undefined) ? options.frequency : 100; + var frequency = (options !== undefined) ? options.frequency : 100; // successCallback required - if (typeof successCallback != "function") { + if (typeof successCallback !== "function") { console.log("Compass Error: successCallback is not a function"); return; } // errorCallback optional - if (errorCallback && (typeof errorCallback != "function")) { + if (errorCallback && (typeof errorCallback !== "function")) { console.log("Compass Error: errorCallback is not a function"); return; } @@ -109,5 +109,7 @@ Compass.prototype.clearWatch = function(id) { }; PhoneGap.addConstructor(function() { - if (typeof navigator.compass == "undefined") navigator.compass = new Compass(); + if (typeof navigator.compass === "undefined") { + navigator.compass = new Compass(); + } }); diff --git a/framework/assets/js/contact.js b/framework/assets/js/contact.js index cb2b8dab..67559c60 100755 --- a/framework/assets/js/contact.js +++ b/framework/assets/js/contact.js @@ -26,7 +26,7 @@ * @param {ContactField[]} urls contact's web sites * @param {DOMString} timezone the contacts time zone */ -var Contact = function(id, displayName, name, nickname, phoneNumbers, emails, addresses, +var Contact = function (id, displayName, name, nickname, phoneNumbers, emails, addresses, ims, organizations, revision, birthday, gender, note, photos, categories, urls, timezone) { this.id = id || null; this.rawId = null; @@ -48,13 +48,33 @@ var Contact = function(id, displayName, name, nickname, phoneNumbers, emails, ad this.timezone = timezone || null; }; +/** + * ContactError. + * An error code assigned by an implementation when an error has occurred + */ +var ContactError = function() { + this.code=null; +}; + +/** + * Error codes + */ +ContactError.UNKNOWN_ERROR = 0; +ContactError.INVALID_ARGUMENT_ERROR = 1; +ContactError.NOT_FOUND_ERROR = 2; +ContactError.TIMEOUT_ERROR = 3; +ContactError.PENDING_OPERATION_ERROR = 4; +ContactError.IO_ERROR = 5; +ContactError.NOT_SUPPORTED_ERROR = 6; +ContactError.PERMISSION_DENIED_ERROR = 20; + /** * Removes contact from device storage. * @param successCB success callback * @param errorCB error callback */ Contact.prototype.remove = function(successCB, errorCB) { - if (this.id == null) { + if (this.id === null) { var errorObj = new ContactError(); errorObj.code = ContactError.NOT_FOUND_ERROR; errorCB(errorObj); @@ -71,48 +91,49 @@ Contact.prototype.remove = function(successCB, errorCB) { */ Contact.prototype.clone = function() { var clonedContact = PhoneGap.clone(this); + var i; clonedContact.id = null; clonedContact.rawId = null; // Loop through and clear out any id's in phones, emails, etc. if (clonedContact.phoneNumbers) { - for (i=0; i 0) { s = s + ","; } - var type = typeof args[i]; - if ((type == "number") || (type == "boolean")) { + type = typeof args[i]; + if ((type === "number") || (type === "boolean")) { s = s + args[i]; - } - else if (args[i] instanceof Array) { - s = s + "[" + args[i] + "]"; - } - else if (args[i] instanceof Object) { - var start = true; - s = s + '{'; - for (var name in args[i]) { - if (args[i][name] != null) { - if (!start) { - s = s + ','; - } - s = s + '"' + name + '":'; - var nameType = typeof args[i][name]; - if ((nameType == "number") || (nameType == "boolean")) { - s = s + args[i][name]; - } - else if ((typeof args[i][name]) == 'function') { - // don't copy the functions - s = s + '""'; - } - else if (args[i][name] instanceof Object) { - s = s + this.stringify(args[i][name]); - } - else { - s = s + '"' + args[i][name] + '"'; - } - start=false; - } - } - s = s + '}'; - } - else { - var a = args[i].replace(/\\/g, '\\\\'); + } else if (args[i] instanceof Array) { + s = s + "[" + args[i] + "]"; + } else if (args[i] instanceof Object) { + start = true; + s = s + '{'; + for (name in args[i]) { + if (args[i][name] !== null) { + if (!start) { + s = s + ','; + } + s = s + '"' + name + '":'; + nameType = typeof args[i][name]; + if ((nameType === "number") || (nameType === "boolean")) { + s = s + args[i][name]; + } else if ((typeof args[i][name]) === 'function') { + // don't copy the functions + s = s + '""'; + } else if (args[i][name] instanceof Object) { + s = s + this.stringify(args[i][name]); + } else { + s = s + '"' + args[i][name] + '"'; + } + start = false; + } + } + s = s + '}'; + } else { + a = args[i].replace(/\\/g, '\\\\'); a = a.replace(/"/g, '\\"'); s = s + '"' + a + '"'; } } s = s + "]"; return s; - } - else { + } else { return JSON.stringify(args); } }; @@ -421,13 +424,14 @@ PhoneGap.stringify = function(args) { * @return */ PhoneGap.clone = function(obj) { + var i, retVal; if(!obj) { return obj; } if(obj instanceof Array){ - var retVal = new Array(); - for(var i = 0; i < obj.length; ++i){ + retVal = []; + for(i = 0; i < obj.length; ++i){ retVal.push(PhoneGap.clone(obj[i])); } return retVal; @@ -445,9 +449,9 @@ PhoneGap.clone = function(obj) { return obj; } - retVal = new Object(); + retVal = {}; for(i in obj){ - if(!(i in retVal) || retVal[i] != obj[i]) { + if(!(i in retVal) || retVal[i] !== obj[i]) { retVal[i] = PhoneGap.clone(obj[i]); } } @@ -499,15 +503,15 @@ PhoneGap.exec = function(success, fail, service, action, args) { eval("var v="+r+";"); // If status is OK, then return value back to caller - if (v.status == PhoneGap.callbackStatus.OK) { + if (v.status === PhoneGap.callbackStatus.OK) { - // If there is a success callback, then call it now with returned value + // If there is a success callback, then call it now with + // returned value if (success) { try { - success(v.message); - } - catch (e) { - console.log("Error in success callback: "+callbackId+" = "+e); + success(v.message); + } catch (e) { + console.log("Error in success callback: " + callbackId + " = " + e); } // Clear callback if not expecting any more results @@ -519,7 +523,7 @@ PhoneGap.exec = function(success, fail, service, action, args) { } // If no result - else if (v.status == PhoneGap.callbackStatus.NO_RESULT) { + else if (v.status === PhoneGap.callbackStatus.NO_RESULT) { // Clear callback if not expecting any more results if (!v.keepCallback) { @@ -536,8 +540,8 @@ PhoneGap.exec = function(success, fail, service, action, args) { try { fail(v.message); } - catch (e) { - console.log("Error in error callback: "+callbackId+" = "+e); + catch (e1) { + console.log("Error in error callback: "+callbackId+" = "+e1); } // Clear callback if not expecting any more results @@ -548,8 +552,8 @@ PhoneGap.exec = function(success, fail, service, action, args) { return null; } } - } catch (e) { - console.log("Error: "+e); + } catch (e2) { + console.log("Error: "+e2); } }; @@ -563,10 +567,10 @@ PhoneGap.callbackSuccess = function(callbackId, args) { if (PhoneGap.callbacks[callbackId]) { // If result is to be sent to callback - if (args.status == PhoneGap.callbackStatus.OK) { + if (args.status === PhoneGap.callbackStatus.OK) { try { if (PhoneGap.callbacks[callbackId].success) { - PhoneGap.callbacks[callbackId].success(args.message); + PhoneGap.callbacks[callbackId].success(args.message); } } catch (e) { @@ -615,38 +619,43 @@ PhoneGap.callbackError = function(callbackId, args) { */ // TODO: Is this used? PhoneGap.run_command = function() { - if (!PhoneGap.available || !PhoneGap.queue.ready) + if (!PhoneGap.available || !PhoneGap.queue.ready) { return; - + } PhoneGap.queue.ready = false; var args = PhoneGap.queue.commands.shift(); - if (PhoneGap.queue.commands.length == 0) { + if (PhoneGap.queue.commands.length === 0) { clearInterval(PhoneGap.queue.timer); PhoneGap.queue.timer = null; } var uri = []; var dict = null; - for (var i = 1; i < args.length; i++) { + var i; + for (i = 1; i < args.length; i++) { var arg = args[i]; - if (arg == undefined || arg == null) + if (arg === undefined || arg === null) { arg = ''; - if (typeof(arg) == 'object') + } + if (typeof(arg) === 'object') { dict = arg; - else + } else { uri.push(encodeURIComponent(arg)); + } } var url = "gap://" + args[0] + "/" + uri.join("/"); - if (dict != null) { + if (dict !== null) { + var name; var query_args = []; - for (var name in dict) { - if (typeof(name) != 'string') - continue; - query_args.push(encodeURIComponent(name) + "=" + encodeURIComponent(dict[name])); + for (name in dict) { + if (dict.hasOwnProperty(name) && (typeof (name) === 'string')) { + query_args.push(encodeURIComponent(name) + "=" + encodeURIComponent(dict[name])); + } } - if (query_args.length > 0) + if (query_args.length > 0) { url += "?" + query_args.join("&"); + } } document.location = url; @@ -667,10 +676,10 @@ PhoneGap.JSCallback = function() { // Callback function when XMLHttpRequest is ready xmlhttp.onreadystatechange=function(){ - if(xmlhttp.readyState == 4){ + if(xmlhttp.readyState === 4){ // If callback has JavaScript statement to execute - if (xmlhttp.status == 200) { + if (xmlhttp.status === 200) { var msg = xmlhttp.responseText; setTimeout(function() { @@ -687,22 +696,22 @@ PhoneGap.JSCallback = function() { } // If callback ping (used to keep XHR request from timing out) - else if (xmlhttp.status == 404) { + else if (xmlhttp.status === 404) { setTimeout(PhoneGap.JSCallback, 10); } // If security error - else if (xmlhttp.status == 403) { + else if (xmlhttp.status === 403) { console.log("JSCallback Error: Invalid token. Stopping callbacks."); } // If server is stopping - else if (xmlhttp.status == 503) { + else if (xmlhttp.status === 503) { console.log("JSCallback Error: Service unavailable. Stopping callbacks."); } // If request wasn't GET - else if (xmlhttp.status == 400) { + else if (xmlhttp.status === 400) { console.log("JSCallback Error: Bad request. Stopping callbacks."); } @@ -715,12 +724,12 @@ PhoneGap.JSCallback = function() { setTimeout(PhoneGap.JSCallback, 100); } } - } + }; - if (PhoneGap.JSCallbackPort == null) { + if (PhoneGap.JSCallbackPort === null) { PhoneGap.JSCallbackPort = CallbackServer.getPort(); } - if (PhoneGap.JSCallbackToken == null) { + if (PhoneGap.JSCallbackToken === null) { PhoneGap.JSCallbackToken = CallbackServer.getToken(); } xmlhttp.open("GET", "http://127.0.0.1:"+PhoneGap.JSCallbackPort+"/"+PhoneGap.JSCallbackToken , true); @@ -774,9 +783,10 @@ PhoneGap.createUUID = function() { PhoneGap.UUIDcreatePart = function(length) { var uuidpart = ""; - for (var i=0; i