Fixing Issue swisnl#58 - Nested input elements not accessible

rodneyrehm · rodneyrehm · commit fe26ef065c80 · 2012-06-26T12:26:29.000+02:00
diff --git a/src/jquery.contextMenu.css b/src/jquery.contextMenu.css
@@ -50,11 +50,12 @@
     border-bottom: 1px solid #DDD;
 }
 
-.context-menu-item > label {
+.context-menu-item > label > input,
+.context-menu-item > label > textarea {
     -webkit-user-select: text;
        -moz-user-select: text;
         -ms-user-select: text;
-            user-select: text;	
+            user-select: text;
 }
 
 .context-menu-item.hover {
diff --git a/src/jquery.contextMenu.js b/src/jquery.contextMenu.js
@@ -21,6 +21,28 @@
 // determine html5 compatibility
 $.support.htmlMenuitem = ('HTMLMenuItemElement' in window);
 $.support.htmlCommand = ('HTMLCommandElement' in window);
+$.support.eventSelectstart = ("onselectstart" in document.documentElement);
+/* // should the need arise, test for css user-select
+$.support.cssUserSelect = (function(){
+    var t = false,
+        e = document.createElement('div');
+    
+    $.each('Moz|Webkit|Khtml|O|ms|Icab|'.split('|'), function(i, prefix) {
+        var propCC = prefix + (prefix ? 'U' : 'u') + 'serSelect',
+            prop = (prefix ? ('-' + prefix.toLowerCase() + '-') : '') + 'user-select';
+            
+        e.style.cssText = prop + ': text;';
+        if (e.style[propCC] == 'text') {
+            t = true;
+            return false;
+        }
+        
+        return true;
+    });
+    
+    return t;
+})();
+*/
 
 var // currently active contextMenu trigger
     $currentTrigger = null,
@@ -1048,12 +1070,11 @@ var // currently active contextMenu trigger
                 $t.appendTo(opt.$menu);
                 
                 // Disable text selection
-                if (!opt.hasTypes) {
-                    if($.browser.msie) {
-                        $t.on('selectstart.disableTextSelect', handle.abortevent);
-                    } else if(!$.browser.mozilla) {
-                        $t.on('mousedown.disableTextSelect', handle.abortevent);
-                    }
+                if (!opt.hasTypes && $.support.eventSelectstart) {
+                    // browsers support user-select: none, 
+                    // IE has a special event for text-selection
+                    // browsers supporting neither will not be preventing text-selection
+                    $t.on('selectstart.disableTextSelect', handle.abortevent);
                 }
             });
             // attach contextMenu to <body> (to bypass any possible overflow:hidden issues on parents of the trigger element)

Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,12 @@`
`50`	`50`	`border-bottom: 1px solid #DDD;`
`51`	`51`	`}`
`52`	`52`
`53`		`-.context-menu-item > label {`
	`53`	`+.context-menu-item > label > input,`
	`54`	`+.context-menu-item > label > textarea {`
`54`	`55`	`-webkit-user-select: text;`
`55`	`56`	`-moz-user-select: text;`
`56`	`57`	`-ms-user-select: text;`
`57`		`- user-select: text;`
	`58`	`+ user-select: text;`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`.context-menu-item.hover {`