From 9a274c06756dabb2797997a27393cc7da4eed5f5 Mon Sep 17 00:00:00 2001
From: kborchers <k_borchers@yahoo.com>
Date: Wed, 12 Oct 2011 13:01:19 -0500
Subject: Menu: Check if menu is scrolling to prevent inadvertent mouseover
 events from being fired on scroll

---
 ui/jquery.ui.menu.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'ui/jquery.ui.menu.js')

diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 6d9db8879..944e47b7c 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -28,6 +28,7 @@ $.widget( "ui.menu", {
 	},
 	_create: function() {
 		this.activeMenu = this.element;
+		this.isScrolling = false;
 		this.menuId = this.element.attr( "id" ) || "ui-menu-" + idIncrement++;
 		if ( this.element.find( ".ui-icon" ).length ) {
 			this.element.addClass( "ui-menu-icons" );
@@ -57,10 +58,13 @@ $.widget( "ui.menu", {
 			},
 			"mouseover .ui-menu-item": function( event ) {
 				event.stopImmediatePropagation();
-				var target = $( event.currentTarget );
-				// Remove ui-state-active class from siblings of the newly focused menu item to avoid a jump caused by adjacent elements both having a class with a border
-				target.siblings().children( ".ui-state-active" ).removeClass( "ui-state-active" );
-				this.focus( event, target );
+				if ( !this.isScrolling ) {
+					var target = $( event.currentTarget );
+					// Remove ui-state-active class from siblings of the newly focused menu item to avoid a jump caused by adjacent elements both having a class with a border
+					target.siblings().children( ".ui-state-active" ).removeClass( "ui-state-active" );
+					this.focus( event, target );
+				}
+				this.isScrolling = false;
 			},
 			"mouseleave": "collapseAll",
 			"mouseleave .ui-menu": "collapseAll",
@@ -74,6 +78,10 @@ $.widget( "ui.menu", {
 						this.collapseAll( event );
 					}
 				}, 0);
+			},
+			scroll: function( event ) {
+				// Keep track of scrolling to prevent mouseover from firing inadvertently when scrolling the menu
+				this.isScrolling = true;
 			}
 		});
 
-- 
cgit v1.2.3


From 3c258bfa3ceab51b7e4c847f1196bd64f6c40cee Mon Sep 17 00:00:00 2001
From: Hans Hillen <hans.hillen@gmail.com>
Date: Wed, 19 Oct 2011 11:41:33 +0200
Subject: Rewrite popup/menu interaction to make popup managed by menu (adds
 trigger option to menu). Makes popup agnostic of menu and allows datepicker
 to use popup (soon).

---
 demos/menu/contextmenu.html |  12 ++--
 demos/popup/popup-menu.html |  24 +++----
 ui/jquery.ui.menu.js        |  31 ++++++++-
 ui/jquery.ui.popup.js       | 149 +++++++++++++++++++++++++++++++++-----------
 4 files changed, 157 insertions(+), 59 deletions(-)

(limited to 'ui/jquery.ui.menu.js')

diff --git a/demos/menu/contextmenu.html b/demos/menu/contextmenu.html
index e031c2c4c..961cdd450 100644
--- a/demos/menu/contextmenu.html
+++ b/demos/menu/contextmenu.html
@@ -14,17 +14,17 @@
 	<link href="../demos.css" rel="stylesheet" />
 	<script>
 	$(function() {
-		$(".demo button").button({
+		var btn = $(".demo button").button({
 			icons: {
 				primary: "ui-icon-home",
 				secondary: "ui-icon-triangle-1-s"
 			}
-		}).next().menu({
+		});
+		$("#cities").menu({
 			select: function(event, ui) {
-				$(this).hide();
 				$("#log").append("<div>Selected " + ui.item.text() + "</div>");
-			}
-		}).popup();
+			},
+			trigger : btn});
 	});
 	</script>
 	<style>
@@ -36,7 +36,7 @@
 <div class="demo">
 
 	<button>Select a city</button>
-	<ul>
+	<ul id="cities">
 		<li><a href="#Amsterdam">Amsterdam</a></li>
 		<li><a href="#Anaheim">Anaheim</a></li>
 		<li><a href="#Cologne">Cologne</a></li>
diff --git a/demos/popup/popup-menu.html b/demos/popup/popup-menu.html
index ddcef4957..8041e2fa3 100644
--- a/demos/popup/popup-menu.html
+++ b/demos/popup/popup-menu.html
@@ -16,16 +16,13 @@
 		function log( msg ) {
 			$( "<div/>" ).text( msg ).appendTo( "#log" );
 		}
-		var selected = {
-			select: function( event, ui ) {
-				log( "Selected: " + ui.item.text() );
-				$(this).popup("close");
-			}
-		};
+		var selected = function( event, ui ) {
+			log( "Selected: " + ui.item.text() );
+			$(this).popup( "close" );
+		}
+
+		$("#button1").button().next().menu( {select: selected, trigger: $("#button1")} );
 
-		$("#button1").button()
-			.next().menu(selected).popup();
-		
 		$( "#rerun" )
 			.button()
 			.click(function() {
@@ -39,10 +36,7 @@
 					}
 				})
 				.next()
-					.menu(selected)
-					.popup({
-						trigger: $("#select")
-					})
+					.menu( {select: selected, trigger: $("#select")} )
 				.parent()
 					.buttonset({
 						items: "button"
@@ -69,8 +63,8 @@
 		<li><a href="#">Utrecht</a></li>
 		<li><a href="#">Zurich</a></li>
 	</ul>
-	
-	
+
+
 	<div>
 		<div>
 			<button id="rerun">Run last action</button>
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 944e47b7c..f2f758d96 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -24,7 +24,8 @@ $.widget( "ui.menu", {
 		position: {
 			my: "left top",
 			at: "right top"
-		}
+		},
+		trigger: null
 	},
 	_create: function() {
 		this.activeMenu = this.element;
@@ -39,6 +40,16 @@ $.widget( "ui.menu", {
 				id: this.menuId,
 				role: "menu"
 			})
+			// Prevent focus from sticking to links inside menu after clicking
+			// them (focus should always stay on UL during navigation).
+			// If the link is clicked, redirect focus to the menu.
+			// TODO move to _bind below
+			.bind( "mousedown.menu", function( event ) {
+				if ( $( event.target).is( "a" ) ) {
+					event.preventDefault();
+					$( this ).focus( 1 );
+				}
+			})
 			// need to catch all clicks on disabled menu
 			// not possible through _bind
 			.bind( "click.menu", $.proxy( function( event ) {
@@ -203,10 +214,24 @@ $.widget( "ui.menu", {
 				}
 			}
 		});
+
+		if ( this.options.trigger ) {
+			this.element.popup({
+				trigger: this.options.trigger,
+				managed: true,
+				focusPopup: $.proxy( function( event, ui ) {
+					this.focus( event, this.element.children( ".ui-menu-item" ).first() );
+					this.element.focus( 1 );
+				}, this)
+			});
+		}
 	},
 
 	_destroy: function() {
 		//destroy (sub)menus
+		if ( this.options.trigger ) {
+			this.element.popup( "destroy" );
+		}
 		this.element
 			.removeAttr( "aria-activedescendant" )
 			.find( ".ui-menu" )
@@ -508,6 +533,10 @@ $.widget( "ui.menu", {
 			item: this.active
 		};
 		this.collapseAll( event, true );
+		if ( this.options.trigger ) {
+			$( this.options.trigger ).focus( 1 );
+			this.element.popup( "close" );
+		}
 		this._trigger( "select", event, ui );
 	}
 });
diff --git a/ui/jquery.ui.popup.js b/ui/jquery.ui.popup.js
index 4726f3a61..8b8c4796c 100644
--- a/ui/jquery.ui.popup.js
+++ b/ui/jquery.ui.popup.js
@@ -14,7 +14,8 @@
  */
 (function($) {
 
-var idIncrement = 0;
+var idIncrement = 0,
+	suppressExpandOnFocus = false;
 
 $.widget( "ui.popup", {
 	version: "@VERSION",
@@ -23,6 +24,8 @@ $.widget( "ui.popup", {
 			my: "left top",
 			at: "left bottom"
 		},
+		managed: false,
+		expandOnFocus: false,
 		show: {
 			effect: "slideDown",
 			duration: "fast"
@@ -43,9 +46,10 @@ $.widget( "ui.popup", {
 		}
 
 		if ( !this.element.attr( "role" ) ) {
-			// TODO alternatives to tooltip are dialog and menu, all three aren't generic popups
-			this.element.attr( "role", "dialog" );
-			this.generatedRole = true;
+			if ( !this.options.managed  ) {
+				this.element.attr( "role", "dialog" );
+				this.generatedRole = true;
+			}
 		}
 
 		this.options.trigger
@@ -59,37 +63,90 @@ $.widget( "ui.popup", {
 
 		this._bind(this.options.trigger, {
 			keydown: function( event ) {
-				// prevent space-to-open to scroll the page, only happens for anchor ui.button
-				if ( $.ui.button && this.options.trigger.is( "a:ui-button" ) && event.keyCode == $.ui.keyCode.SPACE ) {
-					event.preventDefault();
-				}
-				// TODO handle SPACE to open popup? only when not handled by ui.button
-				if ( event.keyCode == $.ui.keyCode.SPACE && this.options.trigger.is( "a:not(:ui-button)" ) ) {
-					this.options.trigger.trigger( "click", event );
-				}
-				// translate keydown to click
-				// opens popup and let's tooltip hide itself
-				if ( event.keyCode == $.ui.keyCode.DOWN ) {
-					// prevent scrolling
-					event.preventDefault();
-					this.options.trigger.trigger( "click", event );
+				switch ( event.keyCode ) {
+					case $.ui.keyCode.TAB:
+						// Waiting for close() will make popup hide too late, which breaks tab key behavior
+						this.element.hide();
+						this.close( event );
+						break;
+					case $.ui.keyCode.ESCAPE:
+						if ( this.isOpen ) {
+							this.close( event );
+						}
+						break;
+					case $.ui.keyCode.SPACE:
+						// prevent space-to-open to scroll the page, only happens for anchor ui.button
+						// TODO check for $.ui.button before using custom selector, once more below
+						if ( this.options.trigger.is( "a:ui-button" ) ) {
+							event.preventDefault();
+						}
+
+						else if (this.options.trigger.is( "a:not(:ui-button)" ) ) {
+							this.options.trigger.trigger( "click", event );
+						}
+						break;
+					case $.ui.keyCode.DOWN:
+					case $.ui.keyCode.UP:
+						// prevent scrolling
+						event.preventDefault();
+						var that = this;
+						clearTimeout( this.closeTimer );
+						setTimeout(function() {
+							that.open( event );
+							that.focusPopup( event );
+						}, 1);
+						break;
 				}
 			},
 			click: function( event ) {
+				event.stopPropagation();
 				event.preventDefault();
+			},
+			mousedown: function( event ) {
+				var noFocus = false;
+				/* TODO: Determine in which cases focus should stay on the trigger after the popup opens
+				(should apply for any trigger that has other interaction besides opening the popup, e.g. a text field) */
+				if ( $( event.target ).is( "input" ) ) {
+					noFocus = true;
+				}
 				if (this.isOpen) {
-					// let it propagate to close
+					suppressExpandOnFocus = true;
+					this.close();
 					return;
 				}
+				this.open( event );
+				var that = this;
 				clearTimeout( this.closeTimer );
 				this._delay(function() {
-					this.open( event );
+					if ( !noFocus ) {
+						that.focusPopup();
+					}
 				}, 1);
 			}
 		});
 
-		if ( !$.ui.menu || !this.element.is( ":ui-menu" ) ) {
-			// default use case, wrap tab order in popup
+		if ( this.options.expandOnFocus ) {
+			this._bind( this.options.trigger, {
+				focus : function( event ) {
+					if ( !suppressExpandOnFocus ) {
+						var that = this;
+						setTimeout(function() {
+							if ( !that.isOpen ) {
+								that.open( event );
+							}
+						}, 1);
+					}
+					setTimeout(function() {
+						suppressExpandOnFocus = false;
+					}, 100);
+				},
+				blur: function( event ) {
+					suppressExpandOnFocus = false;
+				}
+			});
+		}
+		if ( !this.options.managed ) {
+			//default use case, wrap tab order in popup
 			this._bind({ keydown : function( event ) {
 					if ( event.keyCode !== $.ui.keyCode.TAB ) {
 						return;
@@ -109,21 +166,34 @@ $.widget( "ui.popup", {
 		}
 
 		this._bind({
-			// TODO only triggered on element if it can receive focus
-			// bind to document instead?
-			// either element itself or a child should be focusable
+			focusout: function( event ) {
+				var that = this;
+				// use a timer to allow click to clear it and letting that
+				// handle the closing instead of opening again
+				that.closeTimer = setTimeout( function() {
+					that.close( event );
+				}, 100);
+			},
+			focusin: function( event ) {
+				clearTimeout( this.closeTimer );
+			},
+			mouseup: function( event ) {
+				clearTimeout( this.closeTimer );
+			}
+		});
+
+		this._bind({
 			keyup: function( event ) {
 				if ( event.keyCode == $.ui.keyCode.ESCAPE && this.element.is( ":visible" ) ) {
 					this.close( event );
-					// TODO move this to close()? would allow menu.select to call popup.close, and get focus back to trigger
-					this.options.trigger.focus();
+					this.focusTrigger();
 				}
 			}
 		});
 
 		this._bind(document, {
 			click: function( event ) {
-				if ( this.isOpen && !$(event.target).closest(".ui-popup").length ) {
+				if ( this.isOpen && !$( event.target ).closest( this.element.add( this.options.trigger ) ).length ) {
 					this.close( event );
 				}
 			}
@@ -161,11 +231,14 @@ $.widget( "ui.popup", {
 			.attr( "aria-expanded", "true" )
 			.position( position );
 
-		// can't use custom selector when menu isn't loaded
-		if ( $.ui.menu && this.element.is( ":ui-menu" ) ) {
-			this.element.menu( "focus", event, this.element.children( "li" ).first() );
-			this.element.focus();
-		} else {
+		// take trigger out of tab order to allow shift-tab to skip trigger
+		this.options.trigger.attr( "tabindex", -1 );
+		this.isOpen = true;
+		this._trigger( "open", event );
+	},
+
+	focusPopup: function( event ) {
+		if ( !this.options.managed ) {
 			// set focus to the first tabbable element in the popup container
 			// if there are no tabbable elements, set focus on the popup itself
 			var tabbables = this.element.find( ":tabbable" );
@@ -179,11 +252,13 @@ $.widget( "ui.popup", {
 			}
 			tabbables.first().focus( 1 );
 		}
+		this._trigger( "focusPopup", event );
+	},
 
-		// take trigger out of tab order to allow shift-tab to skip trigger
-		this.options.trigger.attr( "tabindex", -1 );
-		this.isOpen = true;
-		this._trigger( "open", event );
+	focusTrigger: function( event ) {
+		suppressExpandOnFocus = true;
+		this.options.trigger.focus();
+		this._trigger( "focusTrigger", event );
 	},
 
 	close: function( event ) {
-- 
cgit v1.2.3


From a0856efef3c392d413aa6cd9bd084dc601a337c6 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 20 Oct 2011 16:57:47 -0400
Subject: Widget: Added window and document properties. Fixes #7801 - Widget:
 Add document and window properties.

---
 ui/jquery.ui.autocomplete.js | 11 +++++------
 ui/jquery.ui.button.js       |  4 ++--
 ui/jquery.ui.dialog.js       |  7 +++----
 ui/jquery.ui.menu.js         |  4 ++--
 ui/jquery.ui.popup.js        |  2 +-
 ui/jquery.ui.spinner.js      |  4 ++--
 ui/jquery.ui.tooltip.js      |  4 ++--
 ui/jquery.ui.widget.js       |  2 ++
 8 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'ui/jquery.ui.menu.js')

diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index ab2edfdff..5dda7d970 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -47,7 +47,6 @@ $.widget( "ui.autocomplete", {
 
 	_create: function() {
 		var self = this,
-			doc = this.element[ 0 ].ownerDocument,
 			// Some browsers only repeat keydown events, not keypress events,
 			// so we use the suppressKeyPress flag to determine if we've already
 			// handled the keydown event. #7269
@@ -197,7 +196,7 @@ $.widget( "ui.autocomplete", {
 		};
 		this.menu = $( "<ul></ul>" )
 			.addClass( "ui-autocomplete" )
-			.appendTo( $( this.options.appendTo || "body", doc )[0] )
+			.appendTo( this.document.find( this.options.appendTo || "body" )[0] )
 			// prevent the close-on-blur in case of a "slow" click on the menu (long mousedown)
 			.mousedown(function( event ) {
 				// clicking on the scrollbar causes focus to shift to the body
@@ -207,7 +206,7 @@ $.widget( "ui.autocomplete", {
 				var menuElement = self.menu.element[ 0 ];
 				if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
 					setTimeout(function() {
-						$( document ).one( 'mousedown', function( event ) {
+						self.document.one( 'mousedown', function( event ) {
 							if ( event.target !== self.element[ 0 ] &&
 								event.target !== menuElement &&
 								!$.contains( menuElement, event.target ) ) {
@@ -239,7 +238,7 @@ $.widget( "ui.autocomplete", {
 						previous = self.previous;
 
 					// only trigger when focus was lost (click on menu)
-					if ( self.element[0] !== doc.activeElement ) {
+					if ( self.element[0] !== self.document[0].activeElement ) {
 						self.element.focus();
 						self.previous = previous;
 						// #6109 - IE triggers two focus events and the second
@@ -273,7 +272,7 @@ $.widget( "ui.autocomplete", {
 		// turning off autocomplete prevents the browser from remembering the
 		// value when navigating through history, so we re-enable autocomplete
 		// if the page is unloaded before the widget is destroyed. #7790
-		this._bind( doc.defaultView, {
+		this._bind( this.window, {
 			beforeunload: function() {
 				this.element.removeAttr( "autocomplete" );
 			}
@@ -297,7 +296,7 @@ $.widget( "ui.autocomplete", {
 			this._initSource();
 		}
 		if ( key === "appendTo" ) {
-			this.menu.element.appendTo( $( value || "body", this.element[0].ownerDocument )[0] );
+			this.menu.element.appendTo( this.document.find( value || "body" )[0] );
 		}
 		if ( key === "disabled" && value && this.xhr ) {
 			this.xhr.abort();
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 63bd1fc73..20eb2ca89 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -174,7 +174,7 @@ $.widget( "ui.button", {
 					}
 					$( this ).addClass( "ui-state-active" );
 					lastActive = this;
-					$( document ).one( "mouseup", function() {
+					self.document.one( "mouseup", function() {
 						lastActive = null;
 					});
 				})
@@ -319,7 +319,7 @@ $.widget( "ui.button", {
 			return;
 		}
 		var buttonElement = this.buttonElement.removeClass( typeClasses ),
-			buttonText = $( "<span></span>", this.element[0].ownerDocument )
+			buttonText = $( "<span></span>", this.document[0] )
 				.addClass( "ui-button-text" )
 				.html( this.options.label )
 				.appendTo( buttonElement.empty() )
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 46320426a..9c9a9b6fc 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -372,8 +372,7 @@ $.widget("ui.dialog", {
 
 	_makeDraggable: function() {
 		var self = this,
-			options = self.options,
-			doc = $( document );
+			options = self.options;
 
 		function filteredUi( ui ) {
 			return {
@@ -396,8 +395,8 @@ $.widget("ui.dialog", {
 			},
 			stop: function( event, ui ) {
 				options.position = [
-					ui.position.left - doc.scrollLeft(),
-					ui.position.top - doc.scrollTop()
+					ui.position.left - self.document.scrollLeft(),
+					ui.position.top - self.document.scrollTop()
 				];
 				$( this )
 					.removeClass( "ui-dialog-dragging" );
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index f2f758d96..bf36a77fe 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -85,7 +85,7 @@ $.widget( "ui.menu", {
 			},
 			blur: function( event ) {
 				this._delay( function() {
-					if ( ! $.contains( this.element[0], document.activeElement ) ) {
+					if ( ! $.contains( this.element[0], this.document[0].activeElement ) ) {
 						this.collapseAll( event );
 					}
 				}, 0);
@@ -207,7 +207,7 @@ $.widget( "ui.menu", {
 			}
 		});
 
-		this._bind( document, {
+		this._bind( this.document, {
 			click: function( event ) {
 				if ( !$( event.target ).closest( ".ui-menu" ).length ) {
 					this.collapseAll( event );
diff --git a/ui/jquery.ui.popup.js b/ui/jquery.ui.popup.js
index 70bf84be0..f6585b761 100644
--- a/ui/jquery.ui.popup.js
+++ b/ui/jquery.ui.popup.js
@@ -187,7 +187,7 @@ $.widget( "ui.popup", {
 			}
 		});
 
-		this._bind(document, {
+		this._bind( this.document, {
 			click: function( event ) {
 				if ( this.isOpen && !$( event.target ).closest( this.element.add( this.options.trigger ) ).length ) {
 					this.close( event );
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index 7fc291c00..9c554b2df 100644
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -53,7 +53,7 @@ $.widget( "ui.spinner", {
 		// turning off autocomplete prevents the browser from remembering the
 		// value when navigating through history, so we re-enable autocomplete
 		// if the page is unloaded before the widget is destroyed. #7790
-		this._bind( this.element[0].ownerDocument.defaultView, {
+		this._bind( this.window, {
 			beforeunload: function() {
 				this.element.removeAttr( "autocomplete" );
 			}
@@ -112,7 +112,7 @@ $.widget( "ui.spinner", {
 		"mousedown .ui-spinner-button": function( event ) {
 			// ensure focus is on (or stays on) the text field
 			event.preventDefault();
-			if ( document.activeElement !== this.element[ 0 ] ) {
+			if ( this.document[0].activeElement !== this.element[ 0 ] ) {
 				this.element.focus();
 			}
 
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 2f8d92969..35b6f9b50 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -166,7 +166,7 @@ $.widget( "ui.tooltip", {
 
 		// don't close if the element has focus
 		// this prevents the tooltip from closing if you hover while focused
-		if ( !force && document.activeElement === target[0] ) {
+		if ( !force && this.document[0].activeElement === target[0] ) {
 			return;
 		}
 
@@ -200,7 +200,7 @@ $.widget( "ui.tooltip", {
 		$( "<div>" )
 			.addClass( "ui-tooltip-content" )
 			.appendTo( tooltip );
-		tooltip.appendTo( document.body );
+		tooltip.appendTo( this.document[0].body );
 		if ( $.fn.bgiframe ) {
 			tooltip.bgiframe();
 		}
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index b78530dca..4b4d41fb1 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -195,6 +195,8 @@ $.Widget.prototype = {
 		if ( element !== this ) {
 			$.data( element, this.widgetName, this );
 			this._bind({ remove: "destroy" });
+			this.document = $( element.ownerDocument );
+			this.window = $( this.document[0].defaultView );
 		}
 
 		this._create();
-- 
cgit v1.2.3