mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-02-10 03:38:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow for different inputs to find

Browse Source
This commit is contained in:
Isaac Murchie
2014-04-16 12:33:20 -07:00
parent aecbbb3a75
commit d31ccee727
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/server/controller.js
View File

@@ -260,9 +260,8 @@ exports.performTouch = function (req, res) {
// some clients, like Python, send an object in which there is an `actions`
// property that is the array of actions
// if this is not an array (having a `shift` method) try to get the
// actions from there
if (typeof gestures.shift !== 'function') {
// get the gestures from there if we don't already have an array
if (gestures && !Array.isArray(gestures)) {
gestures = gestures.actions;
}
@@ -429,8 +428,16 @@ exports.mobileSource = function (req, res) {
exports.find = function (req, res) {
var strategy = "dynamic"
, selector = req.body
, all = selector && selector[0] && typeof selector[0] === "string" && selector[0].toLowerCase() === "all";
, selector = req.body;
// some clients send the selector as the `selector` property of an object,
// rather than the whole body.
// selector ought to be an array
if (selector && !Array.isArray(selector)) {
selector = req.body.selector;
}
var all = selector && selector[0] && typeof selector[0] === "string" && selector[0].toLowerCase() === "all";
if (all) {
req.device.findElements(strategy, selector, getResponseHandler(req, res));