ember-burger-menu
Advanced tools
Comparing version
@@ -13,2 +13,3 @@ import Component from '@ember/component'; | ||
import closest from 'ember-burger-menu/utils/element-closest'; | ||
import { normalizeEvent } from 'ember-jquery-legacy'; | ||
@@ -96,5 +97,6 @@ export default Component.extend(DomMixin, SwipeSupportMixin, { | ||
onClick(e) { | ||
let nativeEvent = normalizeEvent(e); | ||
let elementId = this.get('elementId'); | ||
// Close the menu if clicked outside of it | ||
if (!closest(e.target, `#${elementId} .bm-menu`)) { | ||
if (!closest(nativeEvent.target, `#${elementId} .bm-menu`)) { | ||
this.get('state.actions').close(); | ||
@@ -105,3 +107,4 @@ } | ||
onKeyup(e) { | ||
if (e.keyCode === 27) { | ||
let nativeEvent = normalizeEvent(e); | ||
if (nativeEvent.keyCode === 27) { | ||
this.get('state.actions').close(); | ||
@@ -108,0 +111,0 @@ } |
import Mixin from '@ember/object/mixin'; | ||
import { isNone } from '@ember/utils'; | ||
import { alias } from '@ember/object/computed'; | ||
import { normalizeEvent } from 'ember-jquery-legacy'; | ||
@@ -14,6 +15,7 @@ let meta; | ||
touchStart(e) { | ||
let nativeEvent = normalizeEvent(e); | ||
this._super(...arguments); | ||
// jscs:disable | ||
let touch = e.originalEvent.touches[0]; | ||
let touch = nativeEvent.touches[0]; | ||
// jscs:enable | ||
@@ -32,6 +34,7 @@ | ||
touchMove(e) { | ||
let nativeEvent = normalizeEvent(e); | ||
this._super(...arguments); | ||
// jscs:disable | ||
let touch = e.originalEvent.touches[0]; | ||
let touch = nativeEvent.touches[0]; | ||
// jscs:enable | ||
@@ -46,7 +49,8 @@ | ||
if (isNone(meta.isHorizontal)) { | ||
meta.isHorizontal = (Math.abs(meta.differences.x) > Math.abs(meta.differences.y)); | ||
meta.isHorizontal = | ||
Math.abs(meta.differences.x) > Math.abs(meta.differences.y); | ||
} | ||
// A valid swipe event uses only one finger | ||
if (e.originalEvent.touches.length > 1) { | ||
if (nativeEvent.touches.length > 1) { | ||
meta.isInvalid = true; | ||
@@ -61,10 +65,13 @@ } | ||
let maxSwipeTime = this.get('maxSwipeTime'); | ||
let elapsedTime = new Date().getTime() - meta.start.time; | ||
let elapsedTime = new Date().getTime() - meta.start.time; | ||
if (meta.isHorizontal && !meta.isInvalid && | ||
Math.abs(meta.differences.x) >= minSwipeDistance && | ||
elapsedTime <= maxSwipeTime) { | ||
this.onSwipe((meta.differences.x > 0) ? 'right' : 'left', meta.target); | ||
if ( | ||
meta.isHorizontal && | ||
!meta.isInvalid && | ||
Math.abs(meta.differences.x) >= minSwipeDistance && | ||
elapsedTime <= maxSwipeTime | ||
) { | ||
this.onSwipe(meta.differences.x > 0 ? 'right' : 'left', meta.target); | ||
} | ||
} | ||
}); |
# Changelog | ||
## v3.3.0 | ||
### Pull Requests | ||
- [#110](https://github.com/offirgolan/ember-burger-menu/pull/110) Upgrade to latest Ember CLI and update dependencies *by [@josemarluedke](https://github.com/josemarluedke)* | ||
## v3.2.0 | ||
@@ -4,0 +10,0 @@ |
{ | ||
"name": "ember-burger-menu", | ||
"version": "3.2.0", | ||
"version": "3.3.0", | ||
"description": "An off-canvas sidebar component with a collection of animations and styles using CSS transitions", | ||
"directories": { | ||
"doc": "doc", | ||
"test": "tests" | ||
}, | ||
"scripts": { | ||
"postinstall": "npm rebuild node-sass", | ||
"build": "ember build", | ||
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests", | ||
"lint:js": "eslint .", | ||
"start": "ember serve", | ||
"test": "ember try:each" | ||
"test": "ember test", | ||
"test:all": "ember try:each" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "git@github.com:offirgolan/ember-burger-menu.git" | ||
}, | ||
"engines": { | ||
"node": "^4.5 || 6.* || >= 7.*" | ||
"node": "6.* || 8.* || >= 10.*" | ||
}, | ||
"author": "Offir Golan <offirgolan@gmail.com>", | ||
"license": "MIT", | ||
"devDependencies": { | ||
"broccoli-asset-rev": "^2.4.5", | ||
"ember-ajax": "^3.0.0", | ||
"ember-bootstrap": "0.11.3", | ||
"ember-cli": "~2.18.2", | ||
"ember-cli-app-version": "^2.0.0", | ||
"ember-cli-autoprefixer": "0.6.0", | ||
"bootstrap": "^4.0.0", | ||
"broccoli-asset-rev": "^2.7.0", | ||
"ember-ajax": "^3.1.0", | ||
"ember-bootstrap": "^2.0.0", | ||
"ember-cli": "~3.3.0", | ||
"ember-cli-app-version": "^3.2.0", | ||
"ember-cli-autoprefixer": "0.8.1", | ||
"ember-cli-changelog": "^0.3.4", | ||
"ember-cli-dependency-checker": "^2.1.0", | ||
"ember-cli-github-pages": "0.1.2", | ||
"ember-cli-htmlbars-inline-precompile": "^1.0.0", | ||
"ember-cli-inject-live-reload": "^1.4.1", | ||
"ember-cli-qunit": "^4.1.1", | ||
"ember-cli-dependency-checker": "^3.0.0", | ||
"ember-cli-github-pages": "0.2.0", | ||
"ember-cli-htmlbars-inline-precompile": "^1.0.3", | ||
"ember-cli-inject-live-reload": "^1.8.1", | ||
"ember-cli-qunit": "^4.3.2", | ||
"ember-cli-release": "1.0.0-beta.2", | ||
"ember-cli-sass": "^6.1.2", | ||
"ember-cli-sass": "^7.1.7", | ||
"ember-cli-shims": "^1.2.0", | ||
"ember-cli-sri": "^2.1.0", | ||
"ember-cli-string-helpers": "^1.7.0", | ||
"ember-cli-test-loader": "^1.1.0", | ||
"ember-cli-uglify": "^2.0.0", | ||
"ember-cli-string-helpers": "^1.9.0", | ||
"ember-cli-test-loader": "^2.2.0", | ||
"ember-cli-uglify": "^2.1.0", | ||
"ember-cli-yuidoc": "0.8.8", | ||
"ember-composable-helpers": "2.1.0", | ||
"ember-data": "^2.10.0", | ||
"ember-data": "^3.3.1", | ||
"ember-disable-prototype-extensions": "^1.1.2", | ||
"ember-export-application-global": "^2.0.0", | ||
"ember-font-awesome": "^3.1.1", | ||
"ember-load-initializers": "^1.0.0", | ||
"ember-native-dom-helpers": "0.4.0", | ||
"ember-resolver": "^4.0.0", | ||
"ember-source": "~2.18.0", | ||
"ember-truth-helpers": "1.3.0", | ||
"eslint": "^4.17.0", | ||
"eslint-plugin-ember": "^5.0.0", | ||
"eslint-plugin-node": "^5.2.1", | ||
"loader.js": "^4.2.3" | ||
"ember-font-awesome": "^4.0.0-rc.4", | ||
"ember-load-initializers": "^1.1.0", | ||
"ember-maybe-import-regenerator": "^0.1.6", | ||
"ember-resolver": "^5.0.1", | ||
"ember-source": "~3.3.0", | ||
"ember-source-channel-url": "^1.0.1", | ||
"ember-truth-helpers": "2.0.0", | ||
"ember-try": "^0.2.23", | ||
"eslint": "^5.2.0", | ||
"eslint-plugin-ember": "^5.2.0", | ||
"eslint-plugin-node": "^7.0.1", | ||
"loader.js": "^4.7.0", | ||
"qunit-dom": "^0.7.1" | ||
}, | ||
@@ -66,7 +61,18 @@ "keywords": [ | ||
], | ||
"repository": { | ||
"type": "git", | ||
"url": "git@github.com:offirgolan/ember-burger-menu.git" | ||
}, | ||
"license": "MIT", | ||
"author": "Offir Golan <offirgolan@gmail.com>", | ||
"directories": { | ||
"doc": "doc", | ||
"test": "tests" | ||
}, | ||
"dependencies": { | ||
"ember-cli-babel": "^6.6.0", | ||
"ember-cli-htmlbars": "^1.1.1", | ||
"ember-lifeline": "^2.0.0", | ||
"ember-require-module": "^0.2.0", | ||
"ember-cli-babel": "^6.16.0", | ||
"ember-cli-htmlbars": "^2.0.4", | ||
"ember-lifeline": "^3.0.5", | ||
"ember-require-module": "^0.3.0", | ||
"ember-jquery-legacy": "^1.0.0", | ||
"ember-wormhole": "0.5.3" | ||
@@ -73,0 +79,0 @@ }, |
Sorry, the diff of this file is not supported yet
66
1.54%631
2.1%47839
-85.96%6
20%38
11.76%+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
Updated
Updated
Updated
Updated