From ae841c2bf75d22a1304eb477dd24a5ffe118b123 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 11 Feb 2013 08:17:32 -0800 Subject: [PATCH] pass event to shouldAllow* methods --- src/app/sortable-list.coffee | 8 ++++---- src/packages/tabs/lib/tab-view.coffee | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/sortable-list.coffee b/src/app/sortable-list.coffee index 313178d22..a1c634d1e 100644 --- a/src/app/sortable-list.coffee +++ b/src/app/sortable-list.coffee @@ -14,7 +14,7 @@ class SortableList extends View @on 'drop', '.sortable', @onDrop onDragStart: (event) => - return false if !@shouldAllowDrag() + return false if !@shouldAllowDrag(event) el = @getSortableElement(event) el.addClass 'is-dragging' @@ -34,14 +34,14 @@ class SortableList extends View @getSortableElement(event).removeClass 'is-drop-target' onDrop: (event) => - return false if !@shouldAllowDrop() + return false if !@shouldAllowDrop(event) event.stopPropagation() @find('.is-drop-target').removeClass 'is-drop-target' - shouldAllowDrag: -> + shouldAllowDrag: (event) -> true - shouldAllowDrop: -> + shouldAllowDrop: (event) -> true getDroppedElement: (event) -> diff --git a/src/packages/tabs/lib/tab-view.coffee b/src/packages/tabs/lib/tab-view.coffee index dd867dc54..99715f815 100644 --- a/src/packages/tabs/lib/tab-view.coffee +++ b/src/packages/tabs/lib/tab-view.coffee @@ -45,7 +45,7 @@ class TabView extends SortableList removeTabAtIndex: (index) -> @find(".tab:eq(#{index})").remove() - shouldAllowDrag: -> + shouldAllowDrag: (event) -> panes = rootView.find('.pane') !(panes.length == 1 && panes.find('.sortable').length == 1)