Merge pull request #1160 from mar10/feat-migrate-focus

mar10 · Sep 9, 2024 · 6e8b697 · 6e8b697
2 parents ea2be93 + 98041cc
commit 6e8b697
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 25 deletions.
diff --git a/demo/sample-ext-filter.html b/demo/sample-ext-filter.html
@@ -88,7 +88,7 @@
 			}
 			$("button#btnResetSearch").attr("disabled", false);
 			$("span#matches").text("(" + n + " matches)");
-		}).focus();
+		}).trigger("focus");
 
 		$("button#btnResetSearch").click(function(e){
 			$("input[name=search]").val("");

diff --git a/demo/taxonomy-browser/taxonomy-browser-itis.js b/demo/taxonomy-browser/taxonomy-browser-itis.js
@@ -366,7 +366,7 @@
 				$("#btnResetSearch").attr("disabled", query.length === 0);
 				$("#btnSearch").attr("disabled", query.length < 2);
 			})
-			.focus();
+			.trigger("focus");
 
 		$("#btnResetSearch").click(function (e) {
 			$("#searchResultPane").collapse("hide");

diff --git a/demo/taxonomy-browser/taxonomy-browser.js b/demo/taxonomy-browser/taxonomy-browser.js
@@ -492,7 +492,7 @@
 				$("#btnResetSearch").attr("disabled", query.length === 0);
 				$("#btnSearch").attr("disabled", query.length < 2);
 			})
-			.focus();
+			.trigger("focus");
 
 		$("#btnResetSearch").click(function (e) {
 			$("#searchResultPane").collapse("hide");

diff --git a/src/jquery.fancytree.ariagrid.js b/src/jquery.fancytree.ariagrid.js
@@ -240,10 +240,10 @@
 			$input = $td.find(":input:enabled,a");
 			this.debug("Focus input", $input);
 			if ($input.length) {
-				$input.focus();
+				$input.trigger("focus");
 				setActiveDescendant(this, $input);
 			} else {
-				$td.attr("tabindex", "-1").focus();
+				$td.attr("tabindex", "-1").trigger("focus");
 				setActiveDescendant(this, $td);
 			}
 		} else {
@@ -610,7 +610,7 @@
 				case "esc":
 					if ($activeTd && !tree.forceNavMode) {
 						// Switch from cell-edit-mode to cell-nav-mode
-						// $target.closest( "td" ).focus();
+						// $target.closest( "td" ).trigger("focus");
 						tree.forceNavMode = true;
 						tree.debug("Enter cell-nav-mode");
 						tree.$container.toggleClass(

diff --git a/src/jquery.fancytree.dnd.js b/src/jquery.fancytree.dnd.js
@@ -400,13 +400,15 @@
 								"Re-enable focus that was prevented by jQuery UI draggable."
 							);
 							// node.setFocus();
-							// $(node.span).closest(":tabbable").focus();
+							// $(node.span).closest(":tabbable").trigger("focus");
 							// $(event.target).trigger("focus");
 							// $(event.target).closest(":tabbable").trigger("focus");
 						}
 						setTimeout(function () {
 							// #300
-							$(event.target).closest(":tabbable").focus();
+							$(event.target)
+								.closest(":tabbable")
+								.trigger("focus");
 						}, 10);
 					}
 				});

diff --git a/src/jquery.fancytree.edit.js b/src/jquery.fancytree.edit.js
@@ -111,7 +111,7 @@
 
 		// Focus <input> and bind keyboard handler
 		$input
-			.focus()
+			.trigger("focus")
 			.change(function (event) {
 				$input.addClass("fancytree-edit-dirty");
 			})

diff --git a/src/jquery.fancytree.fixed.js b/src/jquery.fancytree.fixed.js
@@ -665,7 +665,7 @@
 
 		//	treeSetFocus: function(ctx, flag) {
 		////			alert("treeSetFocus" + ctx.tree.$container);
-		//		ctx.tree.$container.focus();
+		//		ctx.tree.$container.trigger("focus");
 		//		$.ui.fancytree.focusTree = ctx.tree;
 		//	}
 	});

diff --git a/src/jquery.fancytree.gridnav.js b/src/jquery.fancytree.gridnav.js
@@ -167,7 +167,9 @@
 			if (flag) {
 				if (ctx.options.titlesTabbable) {
 					if (!triggeredByInput) {
-						$(node.span).find("span.fancytree-title").focus();
+						$(node.span)
+							.find("span.fancytree-title")
+							.trigger("focus");
 						node.setFocus();
 					}
 					// If one node is tabbable, the container no longer needs to be
@@ -177,7 +179,7 @@
 					// Set focus to input sub input (if node was clicked, but not
 					// when TAB was pressed )
 					$outer = $(node.tr || node.span);
-					$outer.find(":input:enabled").first().focus();
+					$outer.find(":input:enabled").first().trigger("focus");
 				}
 			}
 		},
@@ -202,7 +204,7 @@
 					$td = findNeighbourTd($target, event.which);
 					if ($td && $td.length) {
 						// ctx.node.debug("ignore keydown in input", event.which, handleKeys);
-						$td.find(":input:enabled,a").focus();
+						$td.find(":input:enabled,a").trigger("focus");
 						// Prevent Fancytree default navigation
 						return false;
 					}

diff --git a/src/jquery.fancytree.js b/src/jquery.fancytree.js
@@ -5690,7 +5690,9 @@
 					if (opts.titlesTabbable) {
 						if (!isInput) {
 							// #621
-							$(node.span).find(".fancytree-title").focus();
+							$(node.span)
+								.find(".fancytree-title")
+								.trigger("focus");
 						}
 					}
 					if (opts.aria) {
@@ -5703,7 +5705,7 @@
 						);
 						// "ftal_" + opts.idPrefix + node.key);
 					}
-					// $(node.span).find(".fancytree-title").focus();
+					// $(node.span).find(".fancytree-title").trigger("focus");
 					this._triggerNodeEvent("focus", ctx);
 
 					// determine if we have focus on or inside tree container
@@ -5713,10 +5715,10 @@
 
 					if (!hasFancytreeFocus) {
 						// We cannot set KB focus to a node, so use the tree container
-						// #563, #570: IE scrolls on every call to .focus(), if the container
+						// #563, #570: IE scrolls on every call to .trigger("focus"), if the container
 						// is partially outside the viewport. So do it only, when absolutely
 						// necessary.
-						$(tree.$container).focus();
+						$(tree.$container).trigger("focus");
 					}
 
 					// if( opts.autoActivate ){
@@ -6164,7 +6166,7 @@
 						// Node also looses focus if widget blurs
 						this.focusNode.setFocus(false);
 					} else if (flag && (!callOpts || !callOpts.calledByNode)) {
-						$(this.$container).focus();
+						$(this.$container).trigger("focus");
 					}
 					this.$container.toggleClass("fancytree-treefocus", flag);
 					this._triggerTreeEvent(flag ? "focusTree" : "blurTree");

diff --git a/src/jquery.fancytree.menu.js b/src/jquery.fancytree.menu.js
@@ -152,7 +152,7 @@
 					of: ctx.originalEvent,
 					collision: "fit",
 				})
-				.focus();
+				.trigger("focus");
 
 			opts.menu.open.call(tree, ctx.originalEvent, data);
 		},

diff --git a/src/jquery.fancytree.persist.js b/src/jquery.fancytree.persist.js
@@ -420,9 +420,11 @@
 						if (node) {
 							// node.debug("persist: set focus", cookie);
 							if (tree.options.titlesTabbable) {
-								$(node.span).find(".fancytree-title").focus();
+								$(node.span)
+									.find(".fancytree-title")
+									.trigger("focus");
 							} else {
-								$(tree.$container).focus();
+								$(tree.$container).trigger("focus");
 							}
 							// node.setFocus();
 						}

diff --git a/src/jquery.fancytree.table.js b/src/jquery.fancytree.table.js
@@ -536,7 +536,7 @@
 		/*,
 	treeSetFocus: function(ctx, flag) {
 //	        alert("treeSetFocus" + ctx.tree.$container);
-		ctx.tree.$container.focus();
+		ctx.tree.$container.trigger("focus");
 		$.ui.fancytree.focusTree = ctx.tree;
 	}*/
 	});

diff --git a/test/test-ext-keyboard.html b/test/test-ext-keyboard.html
@@ -108,7 +108,7 @@
 			var node = data.node;
 
 			// Set focus to embedded input
-			$("span.fancytree-title :input", node.span).focus();
+			$("span.fancytree-title :input", node.span).trigger("focus");
 		},
 		keydown: function(event, data){
 			var KC = $.ui.keyCode;

diff --git a/test/test-ext-table.html b/test/test-ext-table.html
@@ -127,7 +127,7 @@
 			var n = tree.filterNodes(match);
 			$("#btnResetSearch").attr("disabled", false);
 			$("span#matches").text("(" + n + " matches)");
-		}).focus();
+		}).trigger("focus");
 
 		$("#btnResetSearch").click(function(e){
 			$("input[name=search]").val("");

diff --git a/test/text-ext-filter.html b/test/text-ext-filter.html
@@ -99,7 +99,7 @@
 						$('button#btnResetSearch').attr('disabled', false);
 						$('span#matches').text('(' + n + ' matches)');
 					})
-					.focus();
+					.trigger("focus");
 
 				$('fieldset input:checkbox').change(function(e) {
 					var id = $(this).attr('id'),