From d5d20377a2dda7234984ce5c6d29800260330cef Mon Sep 17 00:00:00 2001
From: Jayant Jain <jayantjain1992@gmail.com>
Date: Wed, 11 Jun 2014 03:39:56 +0530
Subject: [PATCH] Removes panning upon right click in editor
---
app/lib/surface/SpriteBoss.coffee | 2 +-
app/views/editor/level/thangs_tab_view.coffee | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/lib/surface/SpriteBoss.coffee b/app/lib/surface/SpriteBoss.coffee
index 52bd11f45..bdf4d5005 100644
--- a/app/lib/surface/SpriteBoss.coffee
+++ b/app/lib/surface/SpriteBoss.coffee
@@ -266,7 +266,7 @@ module.exports = class SpriteBoss extends CocoClass
return if e and (@disabled or @selectLocked) # Ignore clicks for selection/panning/wizard movement while disabled or select is locked
worldPos = sprite?.thang?.pos
worldPos ?= @camera.screenToWorld {x: e.originalEvent.rawX, y: e.originalEvent.rawY} if e
- if worldPos and (@options.navigateToSelection or not sprite or treemaThangSelected)
+ if worldPos and (@options.navigateToSelection or not sprite or treemaThangSelected) and e?.originalEvent?.nativeEvent?.which isnt 3
@camera.zoomTo(sprite?.imageObject or @camera.worldToSurface(worldPos), @camera.zoom, 1000, true)
sprite = null if @options.choosing # Don't select sprites while choosing
if sprite isnt @selectedSprite
diff --git a/app/views/editor/level/thangs_tab_view.coffee b/app/views/editor/level/thangs_tab_view.coffee
index 22a504480..3642b1e5e 100644
--- a/app/views/editor/level/thangs_tab_view.coffee
+++ b/app/views/editor/level/thangs_tab_view.coffee
@@ -202,7 +202,7 @@ module.exports = class ThangsTabView extends View
onSpriteMouseUp: (e) ->
clearTimeout @backgroundAddClickTimeout
- if e.originalEvent.nativeEvent.button == 2
+ if e.originalEvent.nativeEvent.button == 2 and @selectedExtantThang
@onSpriteContextMenu e
clearInterval(@movementInterval) if @movementInterval?
@movementInterval = null