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:26:25 UTC
[whimsy.git] [1/1] Commit 688b0ef: deleting and undeleting first message
Commit 688b0ef8aa1405962594ccf99b45a14a5ce3f264:
deleting and undeleting first message
Branch: refs/heads/secmail
Author: Sam Ruby <ru...@intertwingly.net>
Committer: Sam Ruby <ru...@intertwingly.net>
Pusher: rubys <ru...@apache.org>
------------------------------------------------------------
www/secmail/views/index.js.rb | +++ -
------------------------------------------------------------
4 changes: 3 additions, 1 deletions.
------------------------------------------------------------
diff --git a/www/secmail/views/index.js.rb b/www/secmail/views/index.js.rb
index 57d8d80..ae469a4 100644
--- a/www/secmail/views/index.js.rb
+++ b/www/secmail/views/index.js.rb
@@ -111,7 +111,7 @@ def selectRow(object)
# 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 -= 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
@@ -136,6 +136,7 @@ def undo(event)
HTTP.patch(selected.href, status: nil) do
delete selected.status
self.forceUpdate()
+ self.selectRow message
end
end
end
@@ -189,6 +190,7 @@ def keydown(event)
index = @messages.findIndex {|m| return m.href == selected}
@messages[index].status = :deleted if index >= 0
Status.pushDeleted selected
+ self.selectRow selected if @selected == selected
self.forceUpdate()
end
end