Merge pull request #259 from stephencattaneo/no-jquery-event

Expect native events instead of jQuery wrapped events
adopted-ember-addons · Jun 11, 2019 · 38d5a9b · 38d5a9b
2 parents 6952392 + 9605199
commit 38d5a9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/addon/mixins/sortable-item.js b/addon/mixins/sortable-item.js
@@ -702,8 +702,7 @@ export default Mixin.create({
   @private
 */
 function getY(event) {
-  let originalEvent = event.originalEvent;
-  let touches = originalEvent? originalEvent.changedTouches : event.changedTouches;
+  let touches = event.changedTouches;
   let touch = touches && touches[0];
 
   if (touch) {
@@ -720,8 +719,7 @@ function getY(event) {
   @private
 */
 function getX(event) {
-  let originalEvent = event.originalEvent;
-  let touches = originalEvent? originalEvent.changedTouches : event.changedTouches;
+  let touches = event.changedTouches;
   let touch = touches && touches[0];
 
   if (touch) {

diff --git a/tests/unit/components/sortable-item-mixin-test.js b/tests/unit/components/sortable-item-mixin-test.js
@@ -3,7 +3,7 @@ import { run } from '@ember/runloop';
 import { moduleForComponent, test } from 'ember-qunit';
 import $ from 'jquery';
 
-const MockEvent = { originalEvent: null };
+const MockEvent = { };
 const MockModel = { name: 'Mock Model' };
 const MockGroup = EmberObject.extend({
   direction: 'y',