Merge pull request #2390 from cb1kenobi/timob-9530

[TIMOB-9530] Fixed default async arg for Ti.Network.HttpClient open().
tidev · Jun 14, 2012 · c8ddb29 · c8ddb29
2 parents 2774f7e + 58110a6
commit c8ddb29
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/mobileweb/titanium/Ti/Network/HTTPClient.js b/mobileweb/titanium/Ti/Network/HTTPClient.js
@@ -94,12 +94,11 @@ define(["Ti/_", "Ti/_/declare", "Ti/_/has", "Ti/_/lang", "Ti/_/Evented", "Ti/Net
 			var httpURLFormatter = Ti.Network.httpURLFormatter,
 				c = this.constants,
 				wc = this.withCredentials;
-			async = wc ? true : !!async;
 			this.abort();
 			this._xhr.open(
 				c.connectionType = method,
 				c.location = _.getAbsolutePath(httpURLFormatter ? httpURLFormatter(url) : url),
-				async
+				wc || async === void 0 ? true : !!async
 			);
 			wc && (this._xhr.withCredentials = wc);
 		},

diff --git a/mobileweb/titanium/Ti/UI.js b/mobileweb/titanium/Ti/UI.js
@@ -13,10 +13,11 @@ define(
 		iphone = handheld && handheld[0] === "iphone",
 		targetHeight = {},
 		hidingAddressBar,
-		hideAddressBar = finishAddressBar = function() {
+		finishAddressBar = function() {
 			Ti.UI._recalculateLayout();
 			hidingAddressBar = 0;
 		},
+		hideAddressBar = finishAddressBar,
 		splashScreen,
 		unitize = dom.unitize;
 
@@ -175,7 +176,7 @@ define(
 					j,
 					len = nodes.length;
 
-				has("ti-instrumentation") && (this._layoutInstrumentationTest = instrumentation.startTest("Layout"));
+				has("ti-instrumentation") && (self._layoutInstrumentationTest = instrumentation.startTest("Layout"));
 
 				// Determine which nodes need to be re-layed out
 				for (i = 0; i < len; i++) {
@@ -257,7 +258,7 @@ define(
 					node._layout._doLayout(node, node._measuredWidth, node._measuredHeight, node._parent._layout._getWidth(node, node.width) === Ti.UI.SIZE, node._parent._layout._getHeight(node, node.height) === Ti.UI.SIZE);
 				}
 
-				has("ti-instrumentation") && instrumentation.stopTest(this._layoutInstrumentationTest, 
+				has("ti-instrumentation") && instrumentation.stopTest(self._layoutInstrumentationTest, 
 					self._elementLayoutCount + " out of approximately " + document.getElementById("TiUIContainer").getElementsByTagName("*").length + " elements laid out.");
 
 				self._layoutInProgress = false;

diff --git a/mobileweb/titanium/Ti/UI/TableViewRow.js b/mobileweb/titanium/Ti/UI/TableViewRow.js
@@ -3,7 +3,7 @@ define(["Ti/_/declare", "Ti/_/lang", "Ti/UI/View", "Ti/_/dom", "Ti/_/css", "Ti/_
 
 	var setStyle = style.set,
 		isDef = lang.isDef,
-		imagePrefix = "themes/" + require.config.ti.theme + "/UI/TableViewRow/"
+		imagePrefix = "themes/" + require.config.ti.theme + "/UI/TableViewRow/",
 		checkImage = imagePrefix + "check.png",
 		childImage = imagePrefix + "child.png",
 		detailImage = imagePrefix + "detail.png";

diff --git a/mobileweb/titanium/Ti/_/analytics.js b/mobileweb/titanium/Ti/_/analytics.js
@@ -15,10 +15,6 @@ define(["Ti/_", "Ti/_/dom", "Ti/_/has", "Ti/_/lang", "Ti/App", "Ti/Platform"],
 				if (analyticsEnabled) {
 					// store event
 					var storage = getStorage();
-						formatZeros = function(v, n){
-							var d = (v+'').length;
-							return (d < n ? (new Array(++n - d)).join("0") : "") + v;
-						};
 
 					storage.push({
 						id: _.uuid(),

diff --git a/mobileweb/titanium/Ti/_/lang.js b/mobileweb/titanium/Ti/_/lang.js
@@ -17,7 +17,7 @@ define(["Ti/_/has"], function(has) {
 	}
 
 	function hitchArgs(scope, method) {
-		var pre = toArray(arguments, 2);
+		var pre = toArray(arguments, 2),
 			named = is(method, "String");
 		return function() {
 			var s = scope || global,