From 6a9b87cac9b85cde6ae464eafe4abbba27e4fe4f Mon Sep 17 00:00:00 2001
From: Hank Duan <duan.hank@gmail.com>
Date: Fri, 21 Nov 2014 11:38:41 -0800
Subject: [PATCH] fix(elementexplorer): eval always treat result as promise

---
 bin/elementexplorer.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/elementexplorer.js b/bin/elementexplorer.js
index 005d9f04e..184b56c7a 100755
--- a/bin/elementexplorer.js
+++ b/bin/elementexplorer.js
@@ -80,7 +80,12 @@ var flowEval = function(code, context, file, callback) {
       process.domain.emit('error', vmErr);
       process.domain.exit();
     }
-    return result.then(function(val) {return val});
+
+    if (webdriver.promise.isPromise(result)) {
+      return result.then(function(val) {return val});
+    } else {
+      return result; 
+    }
   }).then(function(res) {
     if (!vmErr) {
       callback(null, res);