From 7fd67af4e349bf8dca7259f7d6d53918e92db5a5 Mon Sep 17 00:00:00 2001
From: sebv <seb.vincent@gmail.com>
Date: Wed, 18 Jun 2014 22:15:15 +0800
Subject: [PATCH] update for new uiauto command processing

---
 lib/devices/ios/ios-controller.js | 8 ++++++++
 package.json                      | 6 +++---
 submodules/appium-instruments     | 2 +-
 submodules/appium-uiauto          | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/devices/ios/ios-controller.js b/lib/devices/ios/ios-controller.js
index ae15a46e6..2193b1b72 100644
--- a/lib/devices/ios/ios-controller.js
+++ b/lib/devices/ios/ios-controller.js
@@ -230,6 +230,14 @@ iOSController.findUIElementsByXpath = function (selector, ctx, many, curRetry,
 };
 
 iOSController.getSourceForElementForXML = function (ctx, cb) {
+  var _cb = cb;
+  cb = function (err, res) {
+    if (err) return cb(err);
+    // TODO: all this json/xml logic is very expensive, we need
+    // to use a SAX parser instead.
+    if (res.value) res.value = JSON.stringify(res.value);
+    _cb(err, res);
+  };
   if (!ctx) {
     this.proxy("au.mainApp().getTreeForXML()", cb);
   } else {
diff --git a/package.json b/package.json
index 123e00c5f..f77212d0b 100644
--- a/package.json
+++ b/package.json
@@ -43,8 +43,8 @@
     "adm-zip": "~0.4.4",
     "appium-adb": "1.0.2",
     "appium-atoms": "~0.0.5",
-    "appium-instruments": "1.1.0-beta1",
-    "appium-uiauto": "1.2.0-beta3",
+    "appium-instruments": "1.1.0-beta2",
+    "appium-uiauto": "1.2.0-beta4",
     "argparse": "~0.1.15",
     "async": "~0.9.0",
     "binary-cookies": "~0.1.1",
@@ -101,7 +101,7 @@
     "chai-as-promised": "~4.1.1",
     "glob": "~4.0.0",
     "grunt-contrib-jshint": "~0.10.0",
-    "grunt-jscs-checker": "~0.4.4",
+    "grunt-jscs-checker": "~0.5.1",
     "grunt-mocha-test": "~0.11.0",
     "js-yaml": "~3.0.2",
     "mocha": "~1.20.0",
diff --git a/submodules/appium-instruments b/submodules/appium-instruments
index a689c6436..43a10ba16 160000
--- a/submodules/appium-instruments
+++ b/submodules/appium-instruments
@@ -1 +1 @@
-Subproject commit a689c64369192b3b2e26f344444247e5da0be6d5
+Subproject commit 43a10ba165c9ecc78ef1792b7b0269be06f61d1d
diff --git a/submodules/appium-uiauto b/submodules/appium-uiauto
index b32106d2e..24c0915ae 160000
--- a/submodules/appium-uiauto
+++ b/submodules/appium-uiauto
@@ -1 +1 @@
-Subproject commit b32106d2e94aa483221871c340fb961e1838c309
+Subproject commit 24c0915aee082788df14805a84c53f6fa28a8718