From f0970758abc7be5817fb1a94ca67afb15a12b924 Mon Sep 17 00:00:00 2001 From: Brenton Simpson Date: Tue, 20 Sep 2016 18:11:57 -0700 Subject: [PATCH 1/2] PointerEvent: set pressure to 0 unless pointer is down Fixes gh-180 --- src/PointerEvent.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PointerEvent.js b/src/PointerEvent.js index c8b407c5..e39ea7d8 100644 --- a/src/PointerEvent.js +++ b/src/PointerEvent.js @@ -67,7 +67,8 @@ function PointerEvent(inType, inDict) { // Spec requires that pointers without pressure specified use 0.5 for down // state and 0 for up state. var pressure = 0; - if (inDict.pressure) { + + if (inDict.pressure && e.buttons) { pressure = inDict.pressure; } else { pressure = e.buttons ? 0.5 : 0; From 630c7ed6d281f0344099a7c51ad009ae67df414d Mon Sep 17 00:00:00 2001 From: Brenton Simpson Date: Tue, 20 Sep 2016 18:33:29 -0700 Subject: [PATCH 2/2] Build: Update AUTHORS.txt --- AUTHORS.txt | 4 ++++ Gruntfile.js | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index 51eac900..5485da1b 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,5 +1,6 @@ Authors ordered by first contribution +Google, Inc. Daniel Freedman Boris Smus Yvonne Yip @@ -23,3 +24,6 @@ Stefan Neubert Jörn Zaefferer Marius Stefan Bethge Rob Larsen +Alexander Schmitz +Robert Tuttle +Brenton Simpson diff --git a/Gruntfile.js b/Gruntfile.js index 9f2775a8..d1b58fd3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -31,6 +31,11 @@ module.exports = function(grunt) { var allFiles = srcFiles.concat(buildFiles).concat(testFiles); grunt.initConfig({ + authors: { + prior: [ + 'Google, Inc.' + ] + }, uglify: { pointerevents: { options: {