Merge pull request #327 from swisnl/finalize-pull-request-zindex

Finalize pull request zindex

Author: bbrala

README.md

@@ -106,6 +106,7 @@ Font-Awesome icons used from [encharm/Font-Awesome-SVG-PNG](https://github.com/e
 ### Unreleased ###
 
 * Fixed a swith to use the correct type for separators (thanks @RareDevil)
+* Added support for providing a function as zIndex value in options object (thanks @eivindga)
 
 ###  2.0.1 (December 3rd 2015) ###
 

dist/jquery.contextMenu.js

@@ -12,7 +12,7 @@
  *   MIT License http://www.opensource.org/licenses/mit-license
  *   GPL v3 http://opensource.org/licenses/GPL-3.0
  *
- * Date: 2015-12-17T20:34:43.837Z
+ * Date: 2015-12-20T18:49:14.965Z
  */
 
 (function (factory) {
@@ -268,7 +268,7 @@
                 if ((e.data.trigger !== 'right' && e.data.trigger !== 'demand') && e.originalEvent) {
                     return;
                 }
-				
+
                 // Let the current contextmenu decide if it should show or not based on its own trigger settings
                 if (e.mouseButton !== undefined && e.data) {
                     if (!(e.data.trigger == 'left' && e.mouseButton === 0) && !(e.data.trigger == 'right' && e.mouseButton === 2)) {
@@ -897,7 +897,12 @@
 
                 // make sure we're in front
                 if (opt.zIndex) {
-                    css.zIndex = zindex($trigger) + opt.zIndex;
+                  var additionalZValue = opt.zIndex;
+                  // If opt.zIndex is a function, call the function to get the right zIndex.
+                  if (typeof opt.zIndex === 'function') {
+                      additionalZValue = opt.zIndex.call($trigger, opt);
+                  }
+                  css.zIndex = zindex($trigger) + additionalZValue;
                 }
 
                 // add layer

dist/jquery.contextMenu.min.js

@@ -184,16 +184,22 @@ $.contextMenu({
 
 ### zIndex
 
-Specifies the offset to add to the calculated zIndex of the [trigger](#trigger) element. Set to `0` to prevent zIndex manipulation
+Specifies the offset to add to the calculated zIndex of the [trigger](#trigger) element. Set to `0` to prevent zIndex manipulation. Can be a function that returns an int to calculate the zIndex on build.
 
-`zIndex`: `int` default: `1` 
+`zIndex`: `int`|`function` default: `1` 
 
 #### Example
 ```javascript
 $.contextMenu({
     selector: 'span.context-menu',
     zIndex: 10
 });
+
+$.contextMenu({
+    selector: 'span.context-menu',
+    zIndex: function($trigger, opt){
+        return 120;
+});
 ```
 
 ### className

dist/jquery.contextMenu.min.js.map

@@ -899,8 +899,8 @@
                 if (opt.zIndex) {
                   var additionalZValue = opt.zIndex;
                   // If opt.zIndex is a function, call the function to get the right zIndex.
-                  if (typeof opt.zIndex === "function") {
-                      additionalZValue = opt.zIndex.call(this);
+                  if (typeof opt.zIndex === 'function') {
+                      additionalZValue = opt.zIndex.call($trigger, opt);
                   }
                   css.zIndex = zindex($trigger) + additionalZValue;
                 }