Merge branch 'master' of https://github.com/swisnl/jQuery-contextMenu into OliverColeman-hideOnSecondTrigger

Author: bbrala

CHANGELOG.md

@@ -5,6 +5,9 @@
 #### Added
 
 * Ability to define touchstart as trigger (thanks @npuser)
+* Extra event `activated` that triggers after the menu is activated (thanks @AliShahrivarian)
+* Fix for out of bounds problem on window edges (thanks @AliShahrivarian)
+
 
 ### 2.5.0
 

dist/font/context-menu-icons.eot

@@ -12,7 +12,7 @@
  * Licensed under
  *   MIT License http://www.opensource.org/licenses/mit-license
  *
- * Date: 2017-05-25T11:30:28.663Z
+ * Date: 2017-08-30T12:16:04.938Z
  */
 @-webkit-keyframes cm-spin {
   0% {
@@ -54,8 +54,8 @@
   font-style: normal; 
   font-weight: normal;
 
-  src: url("font/context-menu-icons.eot?4yg1f");
-  src: url("font/context-menu-icons.eot?4yg1f#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?4yg1f") format("woff2"), url("font/context-menu-icons.woff?4yg1f") format("woff"), url("font/context-menu-icons.ttf?4yg1f") format("truetype");
+  src: url("font/context-menu-icons.eot?1915n");
+  src: url("font/context-menu-icons.eot?1915n#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?1915n") format("woff2"), url("font/context-menu-icons.woff?1915n") format("woff"), url("font/context-menu-icons.ttf?1915n") format("truetype");
 }
 
 .context-menu-icon-add:before {

dist/font/context-menu-icons.ttf

@@ -11,7 +11,7 @@
  * Licensed under
  *   MIT License http://www.opensource.org/licenses/mit-license
  *
- * Date: 2017-07-16T11:17:51.231Z
+ * Date: 2017-08-30T12:16:04.336Z
  */
 
 // jscs:disable
@@ -1776,7 +1776,7 @@
                 break;
 
             case 'html5':
-                // if <command> or <menuitem> are not handled by the browser,
+                // if <command> and <menuitem> are not handled by the browser,
                 // or options was a bool true,
                 // initialize $.contextMenu for them
                 if ((!$.support.htmlCommand && !$.support.htmlMenuitem) || (typeof options === 'boolean' && options)) {