Set button property to -1 if no mouse button is depressed

Ref gh-242 Fixes gh-173 Closes gh-267
jquery-archive · Feb 18, 2016 · 24e6d2a · 24e6d2a
1 parent 72c36f7
commit 24e6d2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/mouse.js b/src/mouse.js
@@ -87,6 +87,7 @@ var mouseEvents = {
     if (!this.isEventSimulatedFromTouch(inEvent)) {
       var e = this.prepareEvent(inEvent);
       if (!HAS_BUTTONS) { this.prepareButtonsForMove(e, inEvent); }
+      e.button = -1;
       dispatcher.move(e);
     }
   },
@@ -109,7 +110,8 @@ var mouseEvents = {
       // FF Ubuntu includes the lifted button in the `buttons` property on
       // mouseup.
       // https://bugzilla.mozilla.org/show_bug.cgi?id=1223366
-      if (e.buttons === 0 || e.buttons === BUTTON_TO_BUTTONS[e.button]) {
+      e.buttons &= ~BUTTON_TO_BUTTONS[e.button];
+      if (e.buttons === 0) {
         this.cleanupMouse();
         dispatcher.up(e);
       } else {
@@ -121,13 +123,15 @@ var mouseEvents = {
     if (!this.isEventSimulatedFromTouch(inEvent)) {
       var e = this.prepareEvent(inEvent);
       if (!HAS_BUTTONS) { this.prepareButtonsForMove(e, inEvent); }
+      e.button = -1;
       dispatcher.enterOver(e);
     }
   },
   mouseout: function(inEvent) {
     if (!this.isEventSimulatedFromTouch(inEvent)) {
       var e = this.prepareEvent(inEvent);
       if (!HAS_BUTTONS) { this.prepareButtonsForMove(e, inEvent); }
+      e.button = -1;
       dispatcher.leaveOut(e);
     }
   },

diff --git a/tests/intern.js b/tests/intern.js
@@ -27,8 +27,7 @@ define({
   ],
   functionalSuites: [
 
-    // See: https://github.com/jquery/PEP/issues/173
-    // 'tests/functional/pointerevent_button_attribute_mouse-manual',
+    'tests/functional/pointerevent_button_attribute_mouse-manual',
     'tests/functional/pointerevent_capture_mouse-manual',
     'tests/functional/pointerevent_capture_suppressing_mouse-manual',