From b69ab459bd78ae36625de7fd7552535cfb6aa169 Mon Sep 17 00:00:00 2001
From: Katelyn Mann <picklesrus@users.noreply.github.com>
Date: Mon, 18 Apr 2016 16:53:32 -0700
Subject: [PATCH] Fix bad merge. Commit 
 36e0764e577397d451c2270861c3ecbff36891a6 and
 e39a0b70692f89c83493371f141e82010f7c6e7c collided on their use/removal of the
 event param to one of the zoom functions.

---
 core/workspace_svg.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 0194925c9..3aeb66915 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -1061,6 +1061,7 @@ Blockly.WorkspaceSvg.prototype.zoomReset = function(e) {
   this.scrollCenter_();
   // This event has been handled.  Don't start a workspace drag.
   e.stopPropagation();
+  e.preventDefault();
 };
 
 /**
@@ -1105,9 +1106,6 @@ Blockly.WorkspaceSvg.prototype.setScale = function(newScale) {
     // No toolbox, resize flyout.
     this.flyout_.reflow();
   }
-  // This event has been handled.  Don't start a workspace drag.
-  e.stopPropagation();
-  e.preventDefault();
 };
 
 /**