Add new modal.stealfocus option to let the modal prevent focusing on …

…elements outside it during show
qTip2 · May 29, 2012 · f61a615 · f61a615
1 parent 0021618
commit f61a615
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 34 deletions.
diff --git a/dist/jquery.qtip.basic.js b/dist/jquery.qtip.basic.js
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Tue May 29 17:23:05 2012 +0100
+* Date: Tue May 29 19:43:44 2012 +0100
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */

diff --git a/dist/jquery.qtip.css b/dist/jquery.qtip.css
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Tue May 29 17:23:05 2012 +0100
+* Date: Tue May 29 19:43:44 2012 +0100
 */
 
 /* Core qTip styles */

diff --git a/dist/jquery.qtip.js b/dist/jquery.qtip.js
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Tue May 29 17:23:05 2012 +0100
+* Date: Tue May 29 19:43:44 2012 +0100
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -2554,20 +2554,27 @@ function Modal(api)
 				overlay.toggleClass('blurs', options.blur);
 
 				// Make sure we can't focus anything outside the tooltip
-				docBody.bind('focusin'+namespace, function(event) {
-					var target = $(event.target),
-						container = target.closest('.qtip'),
-
-					// Determine if input container target is above this
-					targetOnTop = container.length < 1 ? FALSE : 
-						(parseInt(container[0].style.zIndex, 10) > parseInt(tooltip[0].style.zIndex, 10)); 
-
-					// If we're showing a modal, but focus has landed on an input below
-					// this modal, divert focus to the first visible input in this modal
-					if(!targetOnTop && ($(event.target).closest(selector)[0] !== tooltip[0])) {
-						tooltip.find('input:visible').filter(':first').focus();
-					}
-				});
+				if(options.stealfocus !== FALSE) {
+					docBody.bind('focusin'+namespace, function(event) {
+						var target = $(event.target),
+							container = target.closest('.qtip'),
+							targetOnTop, inputs;
+
+						// Determine if input container target is above this
+						targetOnTop = container.length < 1 ? FALSE :
+							(parseInt(container[0].style.zIndex, 10) > parseInt(tooltip[0].style.zIndex, 10));
+
+						// If we're showing a modal, but focus has landed on an input below
+						// this modal, divert focus to the first visible input in this modal
+						// or if we can't find one... the tooltip itself
+						if(!targetOnTop && ($(event.target).closest(selector)[0] !== tooltip[0])) {
+							inputs = tooltip.find('input:visible')
+
+							if(inputs.length < 1) { target.blur(); }
+							else { inputs.first().focus(); }
+						}
+					});
+				}
 			}
 			else {
 				// Undelegate focus handler
@@ -2664,6 +2671,7 @@ $.extend(TRUE, QTIP.defaults, {
 			on: FALSE,
 			effect: TRUE,
 			blur: TRUE,
+			stealfocus: TRUE,
 			escape: TRUE
 		}
 	}

diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js
diff --git a/src/modal/modal.js b/src/modal/modal.js
@@ -169,20 +169,27 @@ function Modal(api)
 				overlay.toggleClass('blurs', options.blur);
 
 				// Make sure we can't focus anything outside the tooltip
-				docBody.bind('focusin'+namespace, function(event) {
-					var target = $(event.target),
-						container = target.closest('.qtip'),
-
-					// Determine if input container target is above this
-					targetOnTop = container.length < 1 ? FALSE : 
-						(parseInt(container[0].style.zIndex, 10) > parseInt(tooltip[0].style.zIndex, 10)); 
-
-					// If we're showing a modal, but focus has landed on an input below
-					// this modal, divert focus to the first visible input in this modal
-					if(!targetOnTop && ($(event.target).closest(selector)[0] !== tooltip[0])) {
-						tooltip.find('input:visible').filter(':first').focus();
-					}
-				});
+				if(options.stealfocus !== FALSE) {
+					docBody.bind('focusin'+namespace, function(event) {
+						var target = $(event.target),
+							container = target.closest('.qtip'),
+							targetOnTop, inputs;
+
+						// Determine if input container target is above this
+						targetOnTop = container.length < 1 ? FALSE :
+							(parseInt(container[0].style.zIndex, 10) > parseInt(tooltip[0].style.zIndex, 10));
+
+						// If we're showing a modal, but focus has landed on an input below
+						// this modal, divert focus to the first visible input in this modal
+						// or if we can't find one... the tooltip itself
+						if(!targetOnTop && ($(event.target).closest(selector)[0] !== tooltip[0])) {
+							inputs = tooltip.find('input:visible')
+
+							if(inputs.length < 1) { target.blur(); }
+							else { inputs.first().focus(); }
+						}
+					});
+				}
 			}
 			else {
 				// Undelegate focus handler
@@ -279,6 +286,7 @@ $.extend(TRUE, QTIP.defaults, {
 			on: FALSE,
 			effect: TRUE,
 			blur: TRUE,
+			stealfocus: TRUE,
 			escape: TRUE
 		}
 	}