You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by Sam Ruby <ru...@apache.org> on 2015/12/20 15:15:01 UTC

[whimsy.git] [1/1] Commit f68441e: meta-delete from message page

Commit f68441ebdd343aca79dba52bf3f78f5eacf890e7:
    meta-delete from message page
    skip over deleted pages in index page


Branch: refs/heads/secmail
Author: Sam Ruby <ru...@intertwingly.net>
Committer: Sam Ruby <ru...@intertwingly.net>
Pusher: rubys <ru...@apache.org>

------------------------------------------------------------
www/secmail/public/rotatingclock-slow2.gif                   |  
www/secmail/public/secmail.css                               | +++++++ 
www/secmail/views/index.js.rb                                | +++++ ----
www/secmail/views/parts.js.rb                                | +++++++++++++++ -
------------------------------------------------------------
99 changes: 73 additions, 26 deletions.
------------------------------------------------------------


diff --git a/www/secmail/public/rotatingclock-slow2.gif b/www/secmail/public/rotatingclock-slow2.gif
new file mode 100644
index 0000000..6911e37
Binary files /dev/null and b/www/secmail/public/rotatingclock-slow2.gif differ
diff --git a/www/secmail/public/secmail.css b/www/secmail/public/secmail.css
index 3b2a160..1d2666d 100644
--- a/www/secmail/public/secmail.css
+++ b/www/secmail/public/secmail.css
@@ -64,3 +64,10 @@ ul.contextMenu {
   padding: 1px 5px;
   padding-left: 28px;
 }
+
+.spinner {
+  position: absolute;
+  z-index: -1;
+  right: 0;
+  top: 0;
+}
diff --git a/www/secmail/views/index.js.rb b/www/secmail/views/index.js.rb
index dbd8d76..57d8d80 100644
--- a/www/secmail/views/index.js.rb
+++ b/www/secmail/views/index.js.rb
@@ -62,7 +62,7 @@ def componentWillMount()
   def componentDidMount()
     self.fetch_month()
     window.onkeydown = self.keydown
-    @selected = Status.selected
+     self.selectRow Status.selected if @messages.length > 0
   end
 
   # when content changes, ensure selected message is visible
@@ -91,7 +91,7 @@ def fetch_month()
       @messages = @messages.concat(*response.messages)
 
       # select oldest message
-      self.selectRow @messages.last unless @selected
+      self.selectRow Status.selected || @messages.last unless @selected
     end
   end
 
@@ -99,6 +99,8 @@ def fetch_month()
   def selectRow(object)
     if not object
       href = nil
+    elsif typeof(object) == 'string'
+      href = object
     elsif object.respond_to? :currentTarget
       href = object.currentTarget.querySelector('a').getAttribute('href')
     elsif object.respond_to? :href
@@ -107,8 +109,12 @@ def selectRow(object)
       href = object
     end
 
-    Status.selected = href
-    @selected = href
+    # ensure selected message is not deleted
+    index = @messages.findIndex {|m| return m.href == href}
+    index -= 1 while index > 0 and @messages[index].status == :deleted
+    index = @messages.findIndex {|m| return m.status != :deleted} if index == -1
+
+    @selected = Status.selected = @messages[index].href
   end
 
   # navigate
@@ -149,8 +155,11 @@ def keydown(event)
       event.preventDefault()
 
     elsif event.keyCode == 40 # down
-      index = @messages.findIndex {|m| return m.href == @selected}
-      self.selectRow @messages[index+1] if index < @messages.length-1
+      index = @messages.findIndex {|m| return m.href == @selected} + 1
+      while index < @messages.length and @messages[index].status == :deleted
+        index += 1
+      end
+      self.selectRow @messages[index] if index < @messages.length
       event.preventDefault()
 
     elsif event.keyCode == 13 or event.keyCode == 39 # enter/return or right
@@ -158,27 +167,30 @@ def keydown(event)
       window.location.href = selected.href if selected
 
     elsif event.keyCode == 8 or event.keyCode == 46 # backspace or delete
-      event.preventDefault()
-      # mark item as delete pending
-      selected = @selected
-      index = @messages.findIndex {|m| return m.href == selected}
-      @messages[index].status = :deletePending if index >= 0
-
-      # move selected pointer
-      if index > 0
-        self.selectRow @messages[index-1]
-      elsif index < @messages.length - 1
-        self.selectRow @messages[index+1]
-      else
-        self.selectRow nil
-      end
+      if event.metaKey
+        event.preventDefault()
 
-      # send request to server to perform delete
-      HTTP.delete(selected) do
+        # mark item as delete pending
+        selected = @selected
         index = @messages.findIndex {|m| return m.href == selected}
-        @messages[index].status = :deleted if index >= 0
-        Status.pushDeleted selected
-        self.forceUpdate()
+        @messages[index].status = :deletePending if index >= 0
+
+        # move selected pointer
+        if index > 0
+          self.selectRow @messages[index-1]
+        elsif index < @messages.length - 1
+          self.selectRow @messages[index+1]
+        else
+          self.selectRow nil
+        end
+
+        # send request to server to perform delete
+        HTTP.delete(selected) do
+          index = @messages.findIndex {|m| return m.href == selected}
+          @messages[index].status = :deleted if index >= 0
+          Status.pushDeleted selected
+          self.forceUpdate()
+        end
       end
 
     elsif event.keyCode == 'Z'.ord
diff --git a/www/secmail/views/parts.js.rb b/www/secmail/views/parts.js.rb
index aff1b4b..b34b1b7 100644
--- a/www/secmail/views/parts.js.rb
+++ b/www/secmail/views/parts.js.rb
@@ -1,6 +1,7 @@
 class Parts < React
   def initialize
     @selected = nil
+    @busy = false
   end
 
   def render
@@ -16,7 +17,7 @@ def render
       onContextMenu: self.menu,
     }
 
-    _ul @@attachments do |attachment|
+    _ul @@attachments, ref: 'attachments' do |attachment|
       _li options do
         _a attachment.name, href: attachment.name, target: 'content',
           draggable: 'false'
@@ -28,11 +29,21 @@ def render
       _li 'file'
       _li 'delete'
     end
+
+    _img.spinner src: '../../rotatingclock-slow2.gif' if @busy
   end
 
+  # disable context menu and register mouse and keyboard handlers
   def componentDidMount()
     $menu.style.display = :none
     window.onmousedown = self.click
+
+    # register keyboard handler on parent window and all frames
+    window.parent.onkeydown = self.keydown
+    frames = window.parent.frames
+    for i in 0...frames.length
+      frames[i].onkeydown=self.keydown
+    end
   end
 
   # position and show context menu
@@ -44,6 +55,7 @@ def menu(event)
     $menu.style.display = :block
     event.preventDefault()
   end
+
   # hide context menu whenever a click is received outside the menu
   def click(event)
     target = event.target
@@ -51,9 +63,25 @@ def click(event)
       return if target.class == 'contextMenu'
       target = target.parentNode
     end
+    console.log 'click'
     $menu.style.display = :none
   end
 
+  def keydown(event)
+    if event.keyCode == 8 or event.keyCode == 46 # backspace or delete
+      if event.metaKey
+        @busy = true
+        event.stopPropagation()
+
+        pathname = window.parent.location.pathname
+        HTTP.delete(pathname) do
+          Status.pushDeleted pathname
+          window.parent.location.href = '../..'
+        end
+      end
+    end
+  end
+
   #
   # drag/drop support.  Note: support varies by browser (in particular,
   # when events are called and whether or not a particular event has