More tests and cleanup

Author: mar10

jquery.ui-contextmenu.js

@@ -34,13 +34,11 @@
 			create: $.noop,       // menu was initialized
 			createMenu: $.noop,   // menu was initialized (original UI Menu)
 			focus: $.noop,        // menu option got focus
-//			init: $.noop,         // ui-contextmenu was initialized
 			open: $.noop,         // menu was opened
 			select: $.noop        // menu option was selected; return `false` to prevent closing
 		},
 		/** Constructor */
 		_create: function () {
-//			console.log("_create()");
 			var eventNames, targetId,
 				opts = this.options;
 
@@ -77,12 +75,10 @@
 			if(opts.taphold){
 				eventNames += " taphold" + this.eventNamespace;
 			}
-//			console.log("_create() - element.delegate('" + this.eventNamespace + "')");
 			this.element.delegate(opts.delegate, eventNames, $.proxy(this._openMenu, this));
 		},
 		/** Destructor, called on $().contextmenu("destroy"). */
 		_destroy: function(){
-//			console.log("_destroy() element.undelegate('" + this.eventNamespace + "'), menu=", this.$menu);
 			this.element.undelegate(this.eventNamespace);
 
 			this._createUiMenu(null);
@@ -95,18 +91,14 @@
 		/** (Re)Create jQuery UI Menu. */
 		_createUiMenu: function(menuDef){
 			// Remove temporary <ul> if any
-//			console.log("_createUiMenu("+ menuDef + ")");
-
 			if(this.isOpen()){
 				// close without animation, to force async mode
 				this._closeMenu(true);
 			}
 
 			if(this.menuIsTemp){
-//				console.log("_createUiMenu - remove $menu", this.$menu);
 				this.$menu.remove(); // this will also destroy ui.menu
 			} else if(this.$menu){
-//				console.log("_createUiMenu - destroy $menu", this.$menu);
 				this.$menu.menu("destroy").hide();
 			}
 			this.$menu = null;
@@ -124,7 +116,6 @@
 				this.$menu = menuDef;
 			}
 			// Create - but hide - the jQuery UI Menu widget
-//			console.log("_createUiMenu - create $menu", this.$menu);
 			this.$menu
 				.hide()
 //				.addClass("moogle-contextmenu")
@@ -149,7 +140,6 @@
 		},
 		/** Open popup (called on 'contextmenu' event). */
 		_openMenu: function(event){
-//			console.log("_openMenu()");
 			var opts = this.options,
 				posOption = opts.position,
 				self = this,
@@ -164,7 +154,6 @@
 			}
 			ui.menu = this.$menu; // Might have changed in beforeOpen
 			// Register global event handlers that close the dropdown-menu
-//			console.log("_openMenu() - document.bind('" + this.eventNamespace + "')", this.menuIsTemp, this.$menu);
 			$(document).bind("keydown" + this.eventNamespace, function(event){
 				if( event.which === $.ui.keyCode.ESCAPE ){
 					self._closeMenu();
@@ -200,15 +189,14 @@
 
 			this._show(this.$menu, this.options.show, function(){
 				self._trigger.call(self, "open", event, ui);
-//				console.log("_openMenu() - done");
 			});
 		},
 		/** Close popup. */
 		_closeMenu: function(immediately){
 			var self = this,
 				hideOpts = immediately ? false : this.options.hide;
 
-//			console.log("_closeMenu() - document.unbind('" + this.eventNamespace + "')", this.menuIsTemp, this.$menu);
+			// Note: we don't want to unbind the 'contextmenu' event
 			$(document)
 				.unbind("mousedown" + this.eventNamespace)
 				.unbind("touchstart" + this.eventNamespace)
@@ -217,7 +205,6 @@
 			this._hide(this.$menu, hideOpts, function() {
 				self._trigger("close");
 				self.currentTarget = null;
-//				console.log("_closeMenu() - done");
 			});
 		},
 		/** Handle $().contextmenu("option", key, value) calls. */

jquery.ui-contextmenu.min.js

@@ -45,51 +45,10 @@ function TestHelpers() {
 	};
 }
 
-/** Create a profile wrapper */
-/*
-function profile(fn, flag, opts){
-	if( flag === false ){
-		return fn;
-	}
-	var start, elap,
-		count = 0,
-		level = 0,
-		maxLevel = 0,
-		name = fn.name,
-		min =  Math.pow(2, 32) - 1,
-		max = 0,
-		sum = 0,
-		printTime = opts.printTime !== false,
-		wrapper = function(){
-			count += 1;
-			level += 1;
-			if(printTime && level === 1){
-				console.time(name);
-			}
-
-			start = new Date().getTime();
-			fn.apply(this, arguments);
-			elap = new Date().getTime() - start;
-
-			min = Math.min(min, elap);
-			max = Math.max(max, elap);
-			maxLevel = Math.max(maxLevel, elap);
-			sum += elap;
-			if(printTime && level === 1){
-				console.timeEnd(name);
-			}
-			level -= 1;
-		};
-	wrapper.stats = function(){
-		return "count";
-	};
-	return wrapper;
-}
-*/
-
 
 // ****************************************************************************
 
+
 jQuery(document).ready(function(){
 
 /*******************************************************************************
@@ -100,8 +59,10 @@ QUnit.log(function(data) {
 //        window.console.log(data.result + " :: " + data.message);
 	}
 });
+
 QUnit.config.requireExpects = true;
 
+
 var th = new TestHelpers(),
 	log = th.log,
 	logOutput = th.logOutput,
@@ -182,6 +143,7 @@ function _createTest(menu){
 		  "Event sequence OK." );
 }
 
+
 test("create from UL", function(){
 	_createTest("ul#sampleMenu");
 });
@@ -199,7 +161,7 @@ module("open", lifecycle);
 function _openTest(menu){
 	var $ctx, $popup;
 
-	expect(11);
+	expect(18);
 
 	$("#container").contextmenu({
 		delegate: ".hasmenu",
@@ -211,22 +173,38 @@ function _openTest(menu){
 				   "beforeOpen: Got contextmenubeforeopen event" );
 			equal( ui.target.text(), "AAA",
 				  "beforeOpen: ui.target is set" );
-			ok( $popup.is(":hidden"), "beforeOpen: Menu is hidden" );
+			ok( $popup.is(":hidden"),
+				"beforeOpen: Menu is hidden" );
 			ok( ! entry($popup, 0).hasClass("ui-state-disabled"),
 				"beforeOpen: Entry 0 is enabled" );
 			ok( entry($popup, 2).hasClass("ui-state-disabled"),
 				"beforeOpen: Entry 2 is disabled" );
 
-			$("#container").contextmenu("enableEntry", "cut", false);
+			ok($ctx.contextmenu("isOpen"), "isOpen() false in beforeOpen event");
 
-			ok( entry($popup, 0).hasClass("ui-state-disabled"),
-				"beforeOpen: Entry 0 is disabled" );
+			$("#container").contextmenu("enableEntry", "cut", false);
+			$("#container").contextmenu("showEntry", "copy", false);
 		},
 		open: function(event){
 			log("open");
 
-			ok( $popup.is(":visible"), "open: Menu is visible" );
-			ok( entry($popup, 2).hasClass("ui-state-disabled"), "open: Entry is disabled" );
+			ok( $popup.is(":visible"),
+				"open: Menu is visible" );
+			ok( entry($popup, 2).hasClass("ui-state-disabled"),
+				"open: Entry is disabled" );
+
+			ok( $ctx.contextmenu("isOpen"),
+				"isOpen() true in open event");
+
+			ok( entry($popup, 0).is(":visible"),
+				"beforeOpen: Entry 0 is visible" );
+			ok( entry($popup, 0).hasClass("ui-state-disabled"),
+				"beforeOpen: Entry 0 is disabled: enableEntry(false) worked" );
+
+			ok( entry($popup, 1).is(":hidden"),
+				"beforeOpen: Entry 1 is hidden: showEntry(false) worked" );
+			ok( !entry($popup, 1).hasClass("ui-state-disabled"),
+				"beforeOpen: Entry 1 is enabled" );
 
 			equal(logOutput(), "open(),beforeOpen,after open(),open",
 				  "Event sequence OK.");
@@ -237,6 +215,9 @@ function _openTest(menu){
 	$ctx = $(":moogle-contextmenu");
 	$popup = $ctx.contextmenu("getMenu");
 
+	ok($popup, "getMenu() works");
+	ok(!$ctx.contextmenu("isOpen"), "menu initially closed");
+
 	equal( $ctx.length, 1, "widget created");
 	ok($popup.is(":hidden"), "Menu is hidden");
 	log("open()");