no swipe while in detailmode

BeamApp · May 3, 2013 · b1b3dcf · b1b3dcf
1 parent 0c1a2a2
commit b1b3dcf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/assets/js/script.coffee b/assets/js/script.coffee
@@ -100,6 +100,8 @@ class ViewModel extends ko.ViewModel
   @property "swiping", false
   @property "viewportWidth", document.width
 
+  @accessor "isSwipeable", -> not @detailedSubject()
+
   @property "detailedSubject", null
   @property "selectedSubject", null
 

diff --git a/assets/js/touch.coffee b/assets/js/touch.coffee
@@ -33,10 +33,12 @@ $ ->
     true
 
   beginDrag = (e) ->
-    $(e.target).addClass("dragHover")
+    chain = $(e.target).parents().andSelf()
+    chain.filter(".draggable").addClass "dragHover"
 
     dragIntent = new DragIntent e
-    dragIntent.isMaybeDrag = $(e.target).parents().andSelf().is(".draggable")
+    dragIntent.isMaybeDrag = chain.is(".draggable")
+    dragIntent.isMaybeSwipe = chain.is(".swipeable")
 
     if BEAM_BY_LONGPRESS
       dragIntent.timeout = setTimeout _beginDrag, 250
@@ -62,7 +64,7 @@ $ ->
     if dragIntent.isMaybeTap and dragIntent.isMaybeDrag and dx > 0
       dragIntent.detected = "drag"
       _beginDrag()
-    else
+    else if dragIntent.isMaybeSwipe
       dragIntent.detected = "swipe"
       dragIntent.isMaybeTap = dragIntent.isMaybeDrag = false
       $(".pages").removeClass('animated')

diff --git a/views/index.jade b/views/index.jade
@@ -3,7 +3,7 @@ extends layout
 block body
   a.left-edge(data-bind="visible: hasPrevious, click: onPrevious")
   a.right-edge(data-bind="visible: hasNext, click: onNext")
-  .pages.animated(data-bind="left: left, css: { editing: detailedSubject }")
+  .pages.animated(data-bind="left: left, css: { editing: detailedSubject, swipeable: isSwipeable }")
     #subject-page.page
       h1 Beam...
       .page-content(data-bind="foreach: groupedSubjects")