Merge branch 'master' into scripts

CHANGELOG.md

@@ -1,25 +1,26 @@
-yii-pjax Change Log
-===================
-
-2.0.6 Under development
------------------
-- Bug #23: Fixed loading of scripts in pjax containers (nkovacs, silverfire)
-
-2.0.3 Mar 7, 2015
------------------
-- Chg: Merged changes from upstream (samdark)
-
-2.0.2 Dec 4, 2014
------------------
-- Chg #12: Merged changes from upstream (samdark)
-
-2.0.1 Oct 10, 2014
-------------------
-- Bug #9: Fixed missing history option in default settings (tonydspaniard)
-- New #11: add new option "cache" (macklay)
-
-
-2.0.0 Mar 20, 2014
-------------------
-- Bug: Fixed avoid duplicates of _pjax parameter (tof06)
-- Bug: Fixed Pjax/GridView and back button (klevron, tof06, tonydspaniard)
+yii-pjax Change Log
+===================
+
+2.0.6 Under development
+-----------------
+- Bug #23: Fixed loading of scripts in pjax containers (nkovacs, silverfire)
+- Enh #25: Blur the focused element if it's inside Pjax container (GeorgeGardiner)
+
+2.0.3 Mar 7, 2015
+-----------------
+- Chg: Merged changes from upstream (samdark)
+
+2.0.2 Dec 4, 2014
+-----------------
+- Chg #12: Merged changes from upstream (samdark)
+
+2.0.1 Oct 10, 2014
+------------------
+- Bug #9: Fixed missing history option in default settings (tonydspaniard)
+- New #11: add new option "cache" (macklay)
+
+
+2.0.0 Mar 20, 2014
+------------------
+- Bug: Fixed avoid duplicates of _pjax parameter (tof06)
+- Bug: Fixed Pjax/GridView and back button (klevron, tof06, tonydspaniard)

jquery.pjax.js

@@ -310,10 +310,15 @@ function pjax(options) {
       window.history.replaceState(pjax.state, container.title, container.url)
     }
 
+    // Only blur the focus if the focused element is within the container.
+    var blurFocus = $.contains(options.container, document.activeElement)
+
     // Clear out any focused controls before inserting new page contents.
-    try {
-      document.activeElement.blur()
-    } catch (e) { }
+    if (blurFocus) {
+      try {
+        document.activeElement.blur()
+      } catch (e) { }
+    }
 
     if (container.title) document.title = container.title