From a931f0e7be4ba5661a692c0137437d7a555a9dd8 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2019 14:13:02 +0000 Subject: [PATCH 1/5] chore(package): update scratch-blocks to version 0.1.0-prerelease.1564581595 Closes #5034 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 28df3b4d5..697ff7954 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "rimraf": "^2.6.1", "scratch-audio": "0.1.0-prerelease.20190114210212", "scratch-l10n": "3.5.20190724160319", - "scratch-blocks": "0.1.0-prerelease.1563990552", + "scratch-blocks": "0.1.0-prerelease.1564581595", "scratch-paint": "0.2.0-prerelease.20190729153946", "scratch-render": "0.1.0-prerelease.20190605151415", "scratch-storage": "1.3.2", From 645334557703724a92d800edd29296ea6b683dc6 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2019 14:13:06 +0000 Subject: [PATCH 2/5] chore(package): update lockfile package-lock.json --- package-lock.json | 67 +++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index 32c6f7ebf..43b6a1daa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2616,12 +2616,12 @@ } }, "chromedriver": { - "version": "74.0.0", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-74.0.0.tgz", - "integrity": "sha512-xXgsq0l4gVTY9X5vuccOSVj/iEBm3Bf5MIwzSAASIRJagt4BlWw77SxQq1f4JAJ35/9Ys4NLMA/kWFbd7A/gfQ==", + "version": "75.1.0", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-75.1.0.tgz", + "integrity": "sha512-N2P0fg6FS4c+tTG0R7cCOD5qiVo+E6uAz6xVjmbZesYv1xs1iGdcCUo0IqOY+ppD/4OOObG+XWV1CFWXT6UIgA==", "dev": true, "requires": { - "del": "^3.0.0", + "del": "^4.1.1", "extract-zip": "^1.6.7", "mkdirp": "^0.5.1", "request": "^2.88.0", @@ -3543,25 +3543,18 @@ } }, "del": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", - "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", + "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", "dev": true, "requires": { + "@types/glob": "^7.1.1", "globby": "^6.1.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "p-map": "^1.1.1", - "pify": "^3.0.0", - "rimraf": "^2.2.8" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } + "is-path-cwd": "^2.0.0", + "is-path-in-cwd": "^2.0.0", + "p-map": "^2.0.0", + "pify": "^4.0.1", + "rimraf": "^2.6.3" } }, "delayed-stream": { @@ -7006,27 +6999,27 @@ "dev": true }, "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", "dev": true }, "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", + "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", "dev": true, "requires": { - "is-path-inside": "^1.0.0" + "is-path-inside": "^2.1.0" } }, "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", + "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", "dev": true, "requires": { - "path-is-inside": "^1.0.1" + "path-is-inside": "^1.0.2" } }, "is-plain-obj": { @@ -9555,9 +9548,9 @@ } }, "p-map": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", + "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", "dev": true }, "p-retry": { @@ -11235,9 +11228,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.1563990552", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.1563990552.tgz", - "integrity": "sha512-7V6PuufNXdJajpn1bIrB+MABN6bggdAJy5ejhaGFuw4TaUPS7khRWuFGx569Iljt03C+2lzRPIK66cUQ1NpdPg==", + "version": "0.1.0-prerelease.1564581595", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.1564581595.tgz", + "integrity": "sha512-ixktjoum1irVuZ+W31wZCdm4IbTbe4/hY+aQqnfznGivaclDWF5dzdClT3ec+x23/bDupBvIjH6+zmIJWbS/Gg==", "dev": true, "requires": { "exports-loader": "0.6.3", From 4757bb73e4d812870684f5d643b8d9f54d7ad61c Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Wed, 31 Jul 2019 10:27:15 -0400 Subject: [PATCH 3/5] Do not update trimmers only if both have not changed --- src/containers/audio-selector.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/containers/audio-selector.jsx b/src/containers/audio-selector.jsx index 2d5974d5c..5af1f4e9c 100644 --- a/src/containers/audio-selector.jsx +++ b/src/containers/audio-selector.jsx @@ -43,7 +43,8 @@ class AudioSelector extends React.Component { }); } componentWillReceiveProps (newProps) { - if (newProps.trimStart === this.props.trimStart) return; + const {trimStart, trimEnd} = this.props; + if (newProps.trimStart === trimStart && newProps.trimEnd === trimEnd) return; this.setState({ trimStart: newProps.trimStart, trimEnd: newProps.trimEnd From dce65e33a5087ae016ed93e7217b3f86bc9ec7f0 Mon Sep 17 00:00:00 2001 From: Eric Rosenbaum Date: Wed, 31 Jul 2019 10:43:54 -0400 Subject: [PATCH 4/5] Update fade icons --- src/components/sound-editor/icon--fade-in.svg | 9 ++------- src/components/sound-editor/icon--fade-out.svg | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/components/sound-editor/icon--fade-in.svg b/src/components/sound-editor/icon--fade-in.svg index 6c7487584..351f5915a 100644 --- a/src/components/sound-editor/icon--fade-in.svg +++ b/src/components/sound-editor/icon--fade-in.svg @@ -1,14 +1,9 @@ - + Sound/Effects/Fade-in Created with Sketch. - - - - - - + \ No newline at end of file diff --git a/src/components/sound-editor/icon--fade-out.svg b/src/components/sound-editor/icon--fade-out.svg index 96e8d6244..08f3da056 100644 --- a/src/components/sound-editor/icon--fade-out.svg +++ b/src/components/sound-editor/icon--fade-out.svg @@ -1,14 +1,9 @@ - + Sound/Effects/Fade-out Created with Sketch. - - - - - - + \ No newline at end of file From c855152e860dc220b733f47524d3cffd2e5af568 Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Wed, 31 Jul 2019 10:48:06 -0400 Subject: [PATCH 5/5] Prevent default when dragging trim handles to prevent image drag --- src/containers/audio-trimmer.jsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/containers/audio-trimmer.jsx b/src/containers/audio-trimmer.jsx index 78bd4ebac..b8591eabb 100644 --- a/src/containers/audio-trimmer.jsx +++ b/src/containers/audio-trimmer.jsx @@ -42,11 +42,15 @@ class AudioTrimmer extends React.Component { this.containerSize = this.containerElement.getBoundingClientRect().width; this.trimStartDragRecognizer.start(e); this.initialTrim = this.props.trimStart; + e.stopPropagation(); + e.preventDefault(); } handleTrimEndMouseDown (e) { this.containerSize = this.containerElement.getBoundingClientRect().width; this.trimEndDragRecognizer.start(e); this.initialTrim = this.props.trimEnd; + e.stopPropagation(); + e.preventDefault(); } storeRef (el) { this.containerElement = el;