Merge pull request joewalnes#26 from NoiseEee/master

joewalnes · joewalnes · commit 3e6caced77e0 · 2015-02-17T09:46:11.000-06:00
Updated jQuery lib and methods / replaced .bind() with .on()
diff --git a/demo/example.html b/demo/example.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="http://code.jquery.com/jquery-1.6.2.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
     <script src="../jquery.contextmenu.js"></script>
     <link rel="stylesheet" href="../jquery.contextmenu.css">
     <script>
diff --git a/jquery.contextmenu.js b/jquery.contextmenu.js
@@ -26,6 +26,7 @@ jQuery.fn.contextPopup = function(menuData) {
 	// Define default settings
 	var settings = {
 		contextMenuClass: 'contextMenuPlugin',
+        linkClickerClass: 'contextMenuLink',
 		gutterLineClass: 'gutterLine',
 		headerClass: 'header',
 		seperatorClass: 'divider',
@@ -45,22 +46,22 @@ jQuery.fn.contextPopup = function(menuData) {
     }
     settings.items.forEach(function(item) {
       if (item) {
-        var rowCode = '<li><a href="#"><span></span></a></li>';
+        var rowCode = '<li><a href="#" class="'+settings.linkClickerClass+'"><span class="itemTitle"></span></a></li>';
         // if(item.icon)
         //   rowCode += '<img>';
         // rowCode +=  '<span></span></a></li>';
         var row = $(rowCode).appendTo(menu);
         if(item.icon){
           var icon = $('<img>');
           icon.attr('src', item.icon);
-          icon.insertBefore(row.find('span'));
+          icon.insertBefore(row.find('.itemTitle'));
         }
-        row.find('span').text(item.label);
+        row.find('.itemTitle').text(item.label);
           
         if (item.isEnabled != undefined && !item.isEnabled()) {
             row.addClass('disabled');
         } else if (item.action) {
-            row.find('a').click(function () { item.action(e); });
+            row.find('.'+settings.linkClickerClass).click(function () { item.action(e); });
         }
 
       } else {
@@ -72,7 +73,7 @@ jQuery.fn.contextPopup = function(menuData) {
   }
 
   // On contextmenu event (right click)
-  this.bind('contextmenu', function(e) {	
+  this.on('contextmenu', function(e) {
     var menu = createMenu(e)
       .show();
     
@@ -87,13 +88,13 @@ jQuery.fn.contextPopup = function(menuData) {
 
     // Create and show menu
     menu.css({zIndex:1000001, left:left, top:top})
-      .bind('contextmenu', function() { return false; });
+      .on('contextmenu', function() { return false; });
 
     // Cover rest of page with invisible div that when clicked will cancel the popup.
     var bg = $('<div></div>')
       .css({left:0, top:0, width:'100%', height:'100%', position:'absolute', zIndex:1000000})
       .appendTo(document.body)
-      .bind('contextmenu click', function() {
+      .on('contextmenu click', function() {
         // If click or right click anywhere else on page: remove clean up.
         bg.remove();
         menu.remove();
