[whimsy.git] [1/1] Commit 1fc646f: stop fetching months once you've reached the end

[Sam Ruby <ru...@apache.org>]

Commit 1fc646f1621aa00d7bf6a8f80a231fc0fb4c1173:
    stop fetching months once you've reached the end


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                                | ++++++++ ------
www/secmail/views/index.json.rb                              | + -
------------------------------------------------------------
16 changes: 9 additions, 7 deletions.
------------------------------------------------------------


diff --git a/www/secmail/views/index.js.rb b/www/secmail/views/index.js.rb
index 1268941..f333621 100644
--- a/www/secmail/views/index.js.rb
+++ b/www/secmail/views/index.js.rb
@@ -39,8 +39,10 @@ def render
       end
     end
 
-    _input.btn.btn_primary type: 'submit', value: 'fetch previous month',
-      onClick: self.fetch_month
+    if @nextmbox
+      _input.btn.btn_primary type: 'submit', value: 'fetch previous month',
+        onClick: self.fetch_month
+    end
 
     unless @undoStack.empty?
       _input.btn.btn_info type: 'submit', value: 'undo delete',
@@ -48,9 +50,9 @@ def render
     end
   end
 
-  # initialize latest mailbox (year+month)
+  # initialize next mailbox (year+month)
   def componentWillMount()
-    @latest = @@mbox
+    @nextmbox = @@mbox
   end
 
   # on initial load, fetch latest mailbox and subscribe to keyboard events
@@ -77,9 +79,9 @@ def componentDidUpdate()
 
   # fetch a month's worth of messages
   def fetch_month()
-    HTTP.post('', mbox: @latest) do |response|
+    HTTP.post('', mbox: @nextmbox) do |response|
       # update latest mbox
-      @latest = response.mbox if response.mbox
+      @nextmbox = response.mbox
 
       # add messages to list
       @messages = @messages.concat(*response.messages)
diff --git a/www/secmail/views/index.json.rb b/www/secmail/views/index.json.rb
index f373acf..24d5d40 100644
--- a/www/secmail/views/index.json.rb
+++ b/www/secmail/views/index.json.rb
@@ -25,7 +25,7 @@
 
     # return mailbox name and messages
     {
-      mbox: File.basename(mbox, '.yml'),
+      mbox: (File.basename(mbox, '.yml') if index > 0),
       messages: headers.sort_by {|message| message[:time]}.reverse
     }
   end