@egjs/flicking 4.10.2 → 4.10.4

package/dist/flicking.pkgd.js

@@ -4,7 +4,7 @@ name: @egjs/flicking
 license: MIT
 author: NAVER Corp.
 repository: https://github.com/naver/egjs-flicking
-version: 4.10.2
+version: 4.10.4
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -2426,7 +2426,7 @@ version: 4.10.2
     license: MIT
     author: NAVER Corp.
     repository: https://github.com/naver/egjs-axes
-    version: 3.8.1
+    version: 3.8.3
     */
 
     /*! *****************************************************************************
@@ -2521,6 +2521,12 @@ version: 4.10.2
     var MOUSE_LEFT = "left";
     var MOUSE_RIGHT = "right";
     var MOUSE_MIDDLE = "middle";
+    var ANY = "any";
+    var NONE = "none";
+    var SHIFT = "shift";
+    var CTRL = "ctrl";
+    var ALT = "alt";
+    var META = "meta";
     var VELOCITY_INTERVAL = 16;
     var IOS_EDGE_THRESHOLD = 30;
     var IS_IOS_SAFARI = "ontouchstart" in win && agent().browser.name === "safari";
@@ -3424,6 +3430,13 @@ version: 4.10.2
     var SUPPORT_POINTER = ("PointerEvent" in win);
     var SUPPORT_MSPOINTER = ("MSPointerEvent" in win);
     var SUPPORT_POINTER_EVENTS = SUPPORT_POINTER || SUPPORT_MSPOINTER;
+    var isValidKey = function (event, inputKey) {
+      if (!inputKey || inputKey.indexOf(ANY) > -1 || inputKey.indexOf(NONE) > -1 && !event.shiftKey && !event.ctrlKey && !event.altKey && !event.metaKey || inputKey.indexOf(SHIFT) > -1 && event.shiftKey || inputKey.indexOf(CTRL) > -1 && event.ctrlKey || inputKey.indexOf(ALT) > -1 && event.altKey || inputKey.indexOf(META) > -1 && event.metaKey) {
+        return true;
+      }
+
+      return false;
+    };
 
     var EventInput =
     /*#__PURE__*/
@@ -3506,13 +3519,17 @@ version: 4.10.2
       };
 
       __proto._isTouchEvent = function (event) {
-        return event.type.indexOf("touch") > -1;
+        return event.type && event.type.indexOf("touch") > -1;
       };
 
       __proto._isValidButton = function (button, inputButton) {
         return inputButton.indexOf(button) > -1;
       };
 
+      __proto._isValidEvent = function (event, inputKey, inputButton) {
+        return (!inputKey || isValidKey(event, inputKey)) && (!inputButton || this._isValidButton(this._getButton(event), inputButton));
+      };
+
       __proto._preventMouseButton = function (event, button) {
         if (button === MOUSE_RIGHT) {
           win.addEventListener("contextmenu", this._stopContextMenu);
@@ -3540,10 +3557,10 @@ version: 4.10.2
 
       var __proto = MouseEventInput.prototype;
 
-      __proto.onEventStart = function (event, inputButton) {
+      __proto.onEventStart = function (event, inputKey, inputButton) {
         var button = this._getButton(event);
 
-        if (inputButton && !this._isValidButton(button, inputButton)) {
+        if (!this._isValidEvent(event, inputKey, inputButton)) {
           return null;
         }
 
@@ -3552,8 +3569,8 @@ version: 4.10.2
         return this.extendEvent(event);
       };
 
-      __proto.onEventMove = function (event, inputButton) {
-        if (inputButton && !this._isValidButton(this._getButton(event), inputButton)) {
+      __proto.onEventMove = function (event, inputKey, inputButton) {
+        if (!this._isValidEvent(event, inputKey, inputButton)) {
           return null;
         }
 
@@ -3620,12 +3637,21 @@ version: 4.10.2
 
       var __proto = TouchEventInput.prototype;
 
-      __proto.onEventStart = function (event) {
+      __proto.onEventStart = function (event, inputKey) {
         this._baseTouches = event.touches;
+
+        if (!this._isValidEvent(event, inputKey)) {
+          return null;
+        }
+
         return this.extendEvent(event);
       };
 
-      __proto.onEventMove = function (event) {
+      __proto.onEventMove = function (event, inputKey) {
+        if (!this._isValidEvent(event, inputKey)) {
+          return null;
+        }
+
         return this.extendEvent(event);
       };
 
@@ -3697,10 +3723,10 @@ version: 4.10.2
 
       var __proto = PointerEventInput.prototype;
 
-      __proto.onEventStart = function (event, inputButton) {
+      __proto.onEventStart = function (event, inputKey, inputButton) {
         var button = this._getButton(event);
 
-        if (inputButton && !this._isValidButton(button, inputButton)) {
+        if (!this._isValidEvent(event, inputKey, inputButton)) {
           return null;
         }
 
@@ -3711,8 +3737,8 @@ version: 4.10.2
         return this.extendEvent(event);
       };
 
-      __proto.onEventMove = function (event, inputButton) {
-        if (inputButton && !this._isValidButton(this._getButton(event), inputButton)) {
+      __proto.onEventMove = function (event, inputKey, inputButton) {
+        if (!this._isValidEvent(event, inputKey, inputButton)) {
           return null;
         }
 
@@ -3814,14 +3840,14 @@ version: 4.10.2
 
       var __proto = TouchMouseEventInput.prototype;
 
-      __proto.onEventStart = function (event, inputButton) {
+      __proto.onEventStart = function (event, inputKey, inputButton) {
         var button = this._getButton(event);
 
         if (this._isTouchEvent(event)) {
           this._baseTouches = event.touches;
         }
 
-        if (inputButton && !this._isValidButton(button, inputButton)) {
+        if (!this._isValidEvent(event, inputKey, inputButton)) {
           return null;
         }
 
@@ -3830,8 +3856,8 @@ version: 4.10.2
         return this.extendEvent(event);
       };
 
-      __proto.onEventMove = function (event, inputButton) {
-        if (inputButton && !this._isValidButton(this._getButton(event), inputButton)) {
+      __proto.onEventMove = function (event, inputKey, inputButton) {
+        if (!this._isValidEvent(event, inputKey, inputButton)) {
           return null;
         }
 
@@ -3962,6 +3988,13 @@ version: 4.10.2
 
       return null;
     };
+    function getAddEventOptions(eventName) {
+      // The passive default value of the touch event is true.
+      // If not a touch event, return false to support ie11
+      return eventName.indexOf("touch") > -1 ? {
+        passive: false
+      } : false;
+    }
 
     var InputObserver =
     /*#__PURE__*/
@@ -4169,7 +4202,7 @@ version: 4.10.2
             var out = opt.bounce;
             var circular = opt.circular;
 
-            if (circular && (circular[0] || circular[1])) {
+            if (circular[0] && v < min || circular[1] && v > max) {
               return v;
             } else if (v < min) {
               // left
@@ -5179,7 +5212,7 @@ version: 4.10.2
        */
 
 
-      Axes.VERSION = "3.8.1";
+      Axes.VERSION = "3.8.3";
       /* eslint-enable */
 
       /**
@@ -5279,6 +5312,19 @@ version: 4.10.2
      * - touch: 터치 입력 장치
      * - mouse: 마우스
      * - pointer: 마우스 및 터치</ko>
+     * @param {String[]} [inputKey=["any"]] List of key combinations to allow input
+     * - any: any key
+     * - shift: shift key
+     * - ctrl: ctrl key and pinch gesture on the trackpad
+     * - alt: alt key
+     * - meta: meta key
+     * - none: none of these keys are pressed <ko>입력을 허용할 키 조합 목록
+     * - any: 아무 키
+     * - shift: shift 키
+     * - ctrl: ctrl 키 및 트랙패드의 pinch 제스쳐
+     * - alt: alt 키
+     * - meta: meta 키
+     * - none: 아무 키도 눌리지 않은 상태 </ko>
      * @param {String[]} [inputButton=["left"]] List of buttons to allow input
      * - left: Left mouse button and normal touch
      * - middle: Mouse wheel press
@@ -5353,6 +5399,7 @@ version: 4.10.2
         this.element = $(el);
         this.options = __assign$1({
           inputType: ["touch", "mouse", "pointer"],
+          inputKey: [ANY],
           inputButton: [MOUSE_LEFT],
           scale: [1, 1],
           thresholdAngle: 45,
@@ -5461,9 +5508,11 @@ version: 4.10.2
       };
 
       __proto._onPanstart = function (event) {
-        var inputButton = this.options.inputButton;
+        var _a = this.options,
+            inputKey = _a.inputKey,
+            inputButton = _a.inputButton;
         var activeEvent = this._activeEvent;
-        var panEvent = activeEvent.onEventStart(event, inputButton);
+        var panEvent = activeEvent.onEventStart(event, inputKey, inputButton);
 
         if (!panEvent || !this._enabled || activeEvent.getTouches(event, inputButton) > 1) {
           return;
@@ -5489,12 +5538,14 @@ version: 4.10.2
 
         var _a = this.options,
             iOSEdgeSwipeThreshold = _a.iOSEdgeSwipeThreshold,
+            preventClickOnDrag = _a.preventClickOnDrag,
             releaseOnScroll = _a.releaseOnScroll,
+            inputKey = _a.inputKey,
             inputButton = _a.inputButton,
             threshold = _a.threshold,
             thresholdAngle = _a.thresholdAngle;
         var activeEvent = this._activeEvent;
-        var panEvent = activeEvent.onEventMove(event, inputButton);
+        var panEvent = activeEvent.onEventMove(event, inputKey, inputButton);
         var touches = activeEvent.getTouches(event, inputButton);
 
         if (touches === 0 || releaseOnScroll && panEvent && !panEvent.srcEvent.cancelable) {
@@ -5553,7 +5604,7 @@ version: 4.10.2
         panEvent.preventSystemEvent = prevent;
 
         if (prevent && (this._isOverThreshold || distance >= threshold)) {
-          this._dragged = true;
+          this._dragged = preventClickOnDrag;
           this._isOverThreshold = true;
 
           this._observer.change(this, panEvent, toAxis(this.axes, offset));
@@ -5585,14 +5636,10 @@ version: 4.10.2
         var _this = this;
 
         activeEvent === null || activeEvent === void 0 ? void 0 : activeEvent.move.forEach(function (event) {
-          window.addEventListener(event, _this._onPanmove, {
-            passive: false
-          });
+          window.addEventListener(event, _this._onPanmove, getAddEventOptions(event));
         });
         activeEvent === null || activeEvent === void 0 ? void 0 : activeEvent.end.forEach(function (event) {
-          window.addEventListener(event, _this._onPanend, {
-            passive: false
-          });
+          window.addEventListener(event, _this._onPanend, getAddEventOptions(event));
         });
       };
 
@@ -5633,11 +5680,7 @@ version: 4.10.2
         this._observer = observer;
         this._enabled = true;
         this._activeEvent = activeEvent;
-
-        if (this.options.preventClickOnDrag) {
-          element.addEventListener("click", this._preventClickWhenDragged, true);
-        }
-
+        element.addEventListener("click", this._preventClickWhenDragged, true);
         activeEvent.start.forEach(function (event) {
           element.addEventListener(event, _this._onPanstart);
         }); // adding event listener to element prevents invalid behavior in iOS Safari
@@ -5654,10 +5697,7 @@ version: 4.10.2
         var element = this.element;
 
         if (element) {
-          if (this.options.preventClickOnDrag) {
-            element.removeEventListener("click", this._preventClickWhenDragged, true);
-          }
-
+          element.removeEventListener("click", this._preventClickWhenDragged, true);
           activeEvent === null || activeEvent === void 0 ? void 0 : activeEvent.start.forEach(function (event) {
             element.removeEventListener(event, _this._onPanstart);
           });
@@ -9410,7 +9450,7 @@ version: 4.10.2
     license: MIT
     author: NAVER Corp.
     repository: https://github.com/naver/egjs-imready
-    version: 1.3.0
+    version: 1.3.1
     */
 
     /*! *****************************************************************************
@@ -10011,7 +10051,7 @@ version: 4.10.2
         this.readyCount = 0;
         this.totalErrorCount = 0;
         this.elementInfos.forEach(function (info) {
-          if (!info.isReady && info.loader) {
+          if (info.loader) {
             info.loader.destroy();
           }
         });
@@ -14115,7 +14155,7 @@ version: 4.10.2
        */
 
 
-      Flicking.VERSION = "4.10.2";
+      Flicking.VERSION = "4.10.4";
       return Flicking;
     }(Component);