Refactored to avoid duplicate code

Author: mar10

jquery.ui-contextmenu.js

@@ -22,7 +22,12 @@
 "use strict";
 
 var supportSelectstart = "onselectstart" in document.createElement("div"),
-	match, uiVersion;
+	match = $.ui.menu.version.match(/^(\d)\.(\d+)/),
+	uiVersion = {
+		major: parseInt(match[1], 10),
+		minor: parseInt(match[2], 10)
+	},
+	isLTE110 = ( uiVersion.major < 2 && uiVersion.minor < 11 );
 
 $.widget("moogle.contextmenu", {
 	version: "@VERSION",
@@ -351,6 +356,54 @@ $.widget("moogle.contextmenu", {
  * Global functions
  */
 $.extend($.moogle.contextmenu, {
+	/** Convert a menu description into a into a <li> content. */
+	createEntryMarkup: function(entry, $parentLi) {
+		var $a = null;
+
+		if ( !/[^\-\u2014\u2013\s]/.test( entry.title ) ) {
+			// hyphen, em dash, en dash: separator as defined by UI Menu 1.10
+			$parentLi.text(entry.title);
+		} else {
+			if ( isLTE110 ) {
+				// jQuery UI Menu 1.10 or before required an `<a>` tag
+				$parentLi.attr("data-command", entry.cmd);
+				$a = $("<a/>", {
+						html: "" + entry.title,
+						href: "#"
+					}).appendTo($parentLi);
+
+				if ( entry.uiIcon ) {
+					$a.append($("<span class='ui-icon' />").addClass(entry.uiIcon));
+				}
+
+			} else {
+				// jQuery UI Menu 1.11+ preferes to avoid `<a>` tags
+				$parentLi
+					.attr("data-command", entry.cmd)
+					.html("" + entry.title);
+				if ( $.isFunction(entry.action) ) {
+					$parentLi.data("actionHandler", entry.action);
+				}
+				if ( entry.uiIcon ) {
+					$parentLi
+						.append($("<span class='ui-icon' />")
+						.addClass(entry.uiIcon));
+				}
+			}
+			if ( $.isFunction(entry.action) ) {
+				$parentLi.data("actionHandler", entry.action);
+			}
+			if ( entry.disabled ) {
+				$parentLi.addClass("ui-state-disabled");
+			}
+			if ( entry.addClass ) {
+				$parentLi.addClass(entry.addClass);
+			}
+			if ( $.isPlainObject(entry.data) ) {
+				$parentLi.data(entry.data);
+			}
+		}
+	},
 	/** Convert a nested array of command objects into a <ul> structure. */
 	createMenuMarkup: function(options, $parentUl) {
 		var i, menu, $ul, $li;
@@ -370,103 +423,30 @@ $.extend($.moogle.contextmenu, {
 		}
 		return $parentUl;
 	},
+	/** Returns true if the menu item has child menu items */
+	isMenu: function(item) {
+		if ( isLTE110 ) {
+			return item.has(">a[aria-haspopup='true']").length > 0;
+		} else {
+			return item.is("[aria-haspopup='true']");
+		}
+	},
 	/** Replaces the value of elem's first text node child */
 	replaceFirstTextNodeChild: function(elem, text) {
 		elem
 			.contents()
 			.filter(function() { return this.nodeType === 3; })
 			.first()
 			.replaceWith(text);
-	}
-});
-
-match = $.ui.menu.version.match(/^(\d)\.(\d+)/);
-
-uiVersion = {
-	major: parseInt(match[1], 10),
-	minor: parseInt(match[2], 10)
-};
-
-if ( uiVersion.major < 2 && uiVersion.minor < 11 ) {
-	$.extend($.moogle.contextmenu, {
-		/** Convert a menu description into a into a <li> content. */
-		createEntryMarkup: function(entry, $parentLi) {
-			var $a = null;
-
-			// if (entry.title.match(/^---/)) {
-			if ( !/[^\-\u2014\u2013\s]/.test( entry.title ) ) {
-				// hyphen, em dash, en dash: separator as defined by UI Menu 1.10
-				$parentLi.text(entry.title);
-			} else {
-				$parentLi.attr("data-command", entry.cmd);
-				$a = $("<a/>", {
-					html: "" + entry.title, // allow to pass HTML markup
-					href: "#"
-				}).appendTo($parentLi);
-				if ( $.isFunction(entry.action) ) {
-					$parentLi.data("actionHandler", entry.action);
-				}
-				if ( entry.uiIcon ) {
-					$a.append($("<span class='ui-icon' />").addClass(entry.uiIcon));
-				}
-				if ( entry.disabled ) {
-					$parentLi.addClass("ui-state-disabled");
-				}
-				if ( entry.addClass ) {
-					$parentLi.addClass(entry.addClass);
-				}
-				if ( $.isPlainObject(entry.data) ) {
-					$parentLi.data(entry.data);
-				}
-			}
-		},
-		/** Returns true if the menu item has child menu items */
-		isMenu: function(item) {
-			return item.has(">a[aria-haspopup='true']").length > 0;
-		},
-		/** Updates the menu item's title */
-		updateTitle: function(item, title) {
+	},
+	/** Updates the menu item's title */
+	updateTitle: function(item, title) {
+		if ( isLTE110 ) {
 			$.moogle.contextmenu.replaceFirstTextNodeChild($("a", item), title);
-		}
-	});
-} else {
-	$.extend($.moogle.contextmenu, {
-		/** Convert a menu description into a into a <li> content. */
-		createEntryMarkup: function(entry, $parentLi) {
-			if ( !/[^\-\u2014\u2013\s]/.test( entry.title ) ) {
-				$parentLi.text(entry.title);
-			} else {
-				$parentLi
-					.attr("data-command", entry.cmd)
-					.html("" + entry.title);
-				if ( $.isFunction(entry.action) ) {
-					$parentLi.data("actionHandler", entry.action);
-				}
-				if ( entry.uiIcon ) {
-					$parentLi
-						.append($("<span class='ui-icon' />")
-						.addClass(entry.uiIcon));
-				}
-				if ( entry.disabled ) {
-					$parentLi.addClass("ui-state-disabled");
-				}
-				if ( entry.addClass ) {
-					$parentLi.addClass(entry.addClass);
-				}
-				if ( $.isPlainObject(entry.data) ) {
-					$parentLi.data(entry.data);
-				}
-			}
-		},
-		/** Returns true if the menu item has child menu items */
-		isMenu: function(item) {
-			return item.is("[aria-haspopup='true']");
-		},
-		/** Updates the menu item's title */
-		updateTitle: function(item, title) {
+		} else {
 			$.moogle.contextmenu.replaceFirstTextNodeChild(item, title);
 		}
-	});
-}
+	}
+});
 
 }));