fixed conflicts

test/index.html

@@ -216,6 +216,16 @@
                 '<td>waitForElementPresent</td>' +
                 '<td>//div[@id="global-panel"]</td>' +
                 '<td></td>' +
+              '</tr>' +
+							'<tr>' +
+                '<td>click</td>' +
+                '<td>//a[.="Login"]</td>' +
+                '<td></td>' +
+              '</tr>' +
+							'<tr>' +
+                '<td>verifyAttribute</td>' +
+                '<td>//div[@id="global-popup-popup"]@class</td>' +
+                '<td>ui-popup-active</td>' +
               '</tr>' +
               '<tr>' +
                 '<td>waitForElementPresent</td>' +
@@ -306,6 +316,16 @@
               return "";
             };
 
+						// which element
+						nth = function (str) {
+							if (str.split("][").length > 1) {
+								return ":nth-child(" + 
+									str.split("]").slice(-2).shift().replace("[","") +
+								")";
+							}
+							return ""
+						};
+
             // extract selector value
             val = function(str) {
               if (has_selector(str).length > 1) {
@@ -492,7 +512,6 @@
                 close_asyn = undefined;
                 count = undefined;
               }
-
               console.log(madeJS);
               // inject
               add = d.createElement("script");