stop fetching months once you've reached the end

Author: rubys

www/secmail/views/index.js.rb

@@ -39,18 +39,20 @@ 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',
         onClick: self.undo
     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)

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