Trying out the fix @predeekc offers for issue stirno#132.

scmccart · Mar 15, 2016 · 0e5475e · 0e5475e
1 parent 6b4790d
commit 0e5475e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/FluentAutomation.SeleniumWebDriver/Sizzle.cs b/FluentAutomation.SeleniumWebDriver/Sizzle.cs
@@ -37,16 +37,23 @@ private static string sizzleScriptInjection
             }
         }
 
-        public static void Inject(IJavaScriptExecutor executor)
-        {
-            try
-            {
-                if ((bool)executor.ExecuteScript("return typeof fluentjQuery == 'undefined'"))
-                {
-                    executor.ExecuteScript(sizzleScriptInjection);
-                }
-            }
-            catch { }
+        public static void Inject(IJavaScriptExecutor executor)
+        {
+            try
+            {
+                if ((bool)executor.ExecuteScript("return typeof fluentjQuery == 'undefined'"))
+                {
+                    if ((bool)executor.ExecuteScript("return typeof window.jQuery == 'undefined'"))
+                    {
+                        executor.ExecuteScript(sizzleScriptInjection);
+                    }
+                    else
+                    {
+                        executor.ExecuteScript("window.fluentjQuery = window.jQuery");
+                    }
+                }
+            }
+            catch { }
         }
 
         public static BySizzle Find(string selector)

diff --git a/FluentAutomation/Properties/AssemblyGlobal.cs b/FluentAutomation/Properties/AssemblyGlobal.cs
@@ -9,4 +9,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]