Merge remote-tracking branch 'origin/update-deps'

# Conflicts: # dist/font/context-menu-icons.eot # dist/font/context-menu-icons.ttf # dist/font/context-menu-icons.woff # dist/font/context-menu-icons.woff2 # dist/jquery.contextMenu.css # dist/jquery.contextMenu.js # dist/jquery.contextMenu.min.css # dist/jquery.contextMenu.min.css.map # dist/jquery.contextMenu.min.js # dist/jquery.contextMenu.min.js.map # src/sass/icons/_variables.scss
swisnl · Sep 8, 2017 · 2a5b08f · 2a5b08f
2 parents f4f2259 + e48dc96
commit 2a5b08f
Show file tree

Hide file tree

Showing 17 changed files with 5,473 additions and 135 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -12,9 +12,7 @@
   "requireParenthesesAroundIIFE": true,
   "requireCommaBeforeLineBreak": true,
   "requireCamelCaseOrUpperCaseIdentifiers": true,
-  "requireDotNotation": {
-    "allExcept": ["snake_case"]
-  },
+  "requireDotNotation": true,
   "requireSpacesInForStatement": true,
   "requireSpaceBetweenArguments": true,
   "maximumLineLength": {
@@ -35,9 +33,6 @@
   "requireSpacesInFunctionExpression": {
     "beforeOpeningCurlyBrace": true
   },
-  "requireSpacesInsideParentheses": {
-    "all": false
-  },
   "requireSpaceAfterKeywords": [
     "if",
     "else",
@@ -50,9 +45,7 @@
     "catch"
   ],
   "requireSpacesInsideObjectBrackets": "all",
-  "requireSpacesInsideBrackets": false,
   "requireSemicolons": true,
-  "requireSpacesInConditionalExpression": false,
   "requireSpaceAfterBinaryOperators": true,
   "requireLineFeedAtFileEnd": true,
   "requireSpaceBeforeBinaryOperators": [
@@ -69,7 +62,7 @@
   "requireSpacesInNamedFunctionExpression": {
     "beforeOpeningCurlyBrace": true
   },
-  "requirePaddingNewLinesBeforeLineComments": false,
+  "requirePaddingNewLinesBeforeLineComments": true,
   "validateLineBreaks": "LF",
 
   "disallowKeywords": [ "with" ],
@@ -87,6 +80,6 @@
   "disallowSpaceAfterObjectKeys": true,
   "disallowSpaceAfterPrefixUnaryOperators": true,
   "disallowSpaceBeforePostfixUnaryOperators": true,
-  "disallowSpaceBeforeBinaryOperators": [ ",", ":" ],
+  "disallowSpaceBeforeBinaryOperators": [ "," ],
   "disallowMultipleLineBreaks": true
 }
diff --git a/.travis.yml b/.travis.yml
@@ -26,12 +26,12 @@ matrix:
 
 
 install:
-- if [ "$JQUERY" ] ; then nvm install 6 && npm install && npm install jquery@$JQUERY ; fi
+- if [ "$JQUERY" ] ; then nvm install 7 && npm install -g yarn && yarn && yarn add jquery@$JQUERY ; fi
 - if [ "$DOCUMENTATION" ] ; then cd documentation && composer global require couscous/couscous ; fi
 
 script:
-- if [ "$JQUERY" ] ; then npm test ; else /home/travis/.composer/vendor/bin/couscous travis-auto-deploy --php-version=5.5 ; fi
-- if [ "$JQUERY" ] && [ "$SAUCE_USERNAME" ] ; then npm run test-sauce ; fi
+- if [ "$JQUERY" ] ; then yarn run test ; else /home/travis/.composer/vendor/bin/couscous travis-auto-deploy --php-version=5.5 ; fi
+- if [ "$JQUERY" ] && [ "$SAUCE_USERNAME" ] ; then yarn run test-sauce ; fi
 
 deploy:
   provider: npm

diff --git a/dist/font/context-menu-icons.eot b/dist/font/context-menu-icons.eot
diff --git a/dist/font/context-menu-icons.ttf b/dist/font/context-menu-icons.ttf
diff --git a/dist/font/context-menu-icons.woff b/dist/font/context-menu-icons.woff
diff --git a/dist/font/context-menu-icons.woff2 b/dist/font/context-menu-icons.woff2
diff --git a/dist/jquery.contextMenu.css b/dist/jquery.contextMenu.css
@@ -12,7 +12,7 @@
  * Licensed under
  *   MIT License http://www.opensource.org/licenses/mit-license
  *
- * Date: 2017-09-08T12:13:15.882Z
+ * Date: 2017-08-30T15:09:51.172Z
  */
 @-webkit-keyframes cm-spin {
   0% {
@@ -54,8 +54,8 @@
   font-style: normal; 
   font-weight: normal;
 
-  src: url("font/context-menu-icons.eot?gbjx");
-  src: url("font/context-menu-icons.eot?gbjx#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?gbjx") format("woff2"), url("font/context-menu-icons.woff?gbjx") format("woff"), url("font/context-menu-icons.ttf?gbjx") format("truetype");
+  src: url("font/context-menu-icons.eot?35p2z");
+  src: url("font/context-menu-icons.eot?35p2z#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?35p2z") format("woff2"), url("font/context-menu-icons.woff?35p2z") format("woff"), url("font/context-menu-icons.ttf?35p2z") format("truetype");
 }
 
 .context-menu-icon-add:before {

diff --git a/dist/jquery.contextMenu.js b/dist/jquery.contextMenu.js
@@ -11,7 +11,7 @@
  * Licensed under
  *   MIT License http://www.opensource.org/licenses/mit-license
  *
- * Date: 2017-09-08T12:13:16.104Z
+ * Date: 2017-08-30T12:41:32.950Z
  */
 
 // jscs:disable
@@ -116,10 +116,6 @@
             // flag denoting if a second trigger should simply move (true) or rebuild (false) an open menu
             // as long as the trigger happened on one of the trigger-element's child nodes
             reposition: true,
-            // Flag denoting if a second trigger should close the menu, as long as 
-            // the trigger happened on one of the trigger-element's child nodes.
-            // This overrides the reposition option.
-            hideOnSecondTrigger: false,
 
             //ability to select submenu
             selectableSubMenu: false,
@@ -240,8 +236,7 @@
             // events
             events: {
                 show: $.noop,
-                hide: $.noop,
-                activated: $.noop
+                hide: $.noop
             },
             // default callback
             callback: null,
@@ -476,12 +471,7 @@
                         $(target).trigger(e);
                         root.$layer.show();
                     }
-
-                    if (root.hideOnSecondTrigger && triggerAction && root.$menu !== null && typeof root.$menu !== 'undefined') {
-                      root.$menu.trigger('contextmenu:hide');
-                      return;
-                    }
-
+
                     if (root.reposition && triggerAction) {
                         if (document.elementFromPoint) {
                             if (root.$trigger.is(target)) {
@@ -1007,9 +997,6 @@
                 // position and show context menu
                 opt.$menu.css(css)[opt.animation.show](opt.animation.duration, function () {
                     $trigger.trigger('contextmenu:visible');
-
-                    op.activated(opt);
-                    opt.events.activated();
                 });
                 // make options available and set state
                 $trigger
@@ -1540,26 +1527,6 @@
                 // Wait for promise completion. .then(success, error, notify) (we don't track notify). Bind the opt
                 // and root to avoid scope problems
                 promise.then(completedPromise.bind(this, opt, root), errorPromise.bind(this, opt, root));
-            },
-            // operation that will run after contextMenu showed on screen
-            activated: function(opt){
-                var $menu = opt.$menu;
-                var $menuOffset = $menu.offset();
-                var winHeight = $(window).height();
-                var winScrollTop = $(window).scrollTop();
-                var menuHeight = $menu.height();
-                if(menuHeight > winHeight){
-                    $menu.css({
-                        'height' : winHeight + 'px',
-                        'overflow-x': 'hidden',
-                        'overflow-y': 'auto',
-                        'top': winScrollTop + 'px'
-                    });
-                } else if(($menuOffset.top < winScrollTop) || ($menuOffset.top + menuHeight > winScrollTop + winHeight)){
-                    $menu.css({
-                        'top': '0px'
-                    });
-                } 
             }
         };
 
@@ -1649,20 +1616,6 @@
         }
 
         switch (operation) {
-
-            case 'update':
-                // Updates visibility and such
-                if(_hasContext){
-                    op.update($context);
-                } else {
-                    for(var menu in menus){
-                        if(menus.hasOwnProperty(menu)){
-                            op.update(menus[menu]);
-                        }
-                    }
-                }
-                break;
-
             case 'create':
                 // no selector no joy
                 if (!o.selector) {

diff --git a/dist/jquery.contextMenu.min.css b/dist/jquery.contextMenu.min.css