Skip to content
This repository
Browse code

do nou cache entry after comment edit. closes #129.

  • Loading branch information...
commit 1fc49b26ad84ae8e816841b7931ce1e019043806 1 parent a2438cc
Hiroshi Nakamura authored
2  app/controllers/entry_controller.rb
@@ -473,6 +473,8 @@ def add_comment
473 473
     body = param(:body)
474 474
     if comment
475 475
       comment_id = Entry.edit_comment(create_opt(:id => id, :comment => comment, :body => body))
  476
+      flash[:updated_id] = id
  477
+      flash[:updated_comment] = comment_id
476 478
       redirect_to_entry_or_list
477 479
     else
478 480
       comment_id = Entry.add_comment(create_opt(:id => id, :body => body))
1  app/helpers/application_helper.rb
@@ -46,6 +46,7 @@ def jpmobile?
46 46
 
47 47
   def cell_phone?
48 48
     jpmobile? and @controller.request.mobile?
  49
+    true
49 50
   end
50 51
 
51 52
   def i_mode?
7  app/helpers/entry_helper.rb
@@ -908,13 +908,6 @@ def list_range_notation(threads)
908 908
     end
909 909
   end
910 910
 
911  
-  def bottom_menu_link
912  
-    if cell_phone? and ctx.inbox
913  
-      label = '8.menu'
914  
-      link_to(h("[#{label}]"), '#bottom', accesskey('8'))
915  
-    end
916  
-  end
917  
-
918 911
   def next_entry(eid)
919 912
     return if @original_threads.nil? or @original_threads.empty?
920 913
     entries = @original_threads.map { |thread| thread.entries }.flatten
8  app/views/entry/_entries.html.erb
@@ -7,7 +7,7 @@
7 7
   <%- end -%>
8 8
 <%- else -%>
9 9
   <%- form_tag({:action => 'add'}) do -%>
10  
-    <p><a name="top"></a><%= post_entry_form %><%= bottom_menu_link %></p>
  10
+    <p><a name="top"></a><%= post_entry_form %></p>
11 11
   <%- end -%>
12 12
   <%- if ctx.user_for -%>
13 13
     <p><%= user_picture(ctx.user_for) %><%= user_status_icon(ctx.user_for) %> <%= h(user_name(ctx.user_for)) %> <%= link_to(h('[profile]'), '#profile') %></p>
@@ -22,10 +22,8 @@
22 22
     <p>entries related to: <%= link_to(h(ctx.link), u(ctx.link)) %></p>
23 23
   <%- end -%>
24 24
 <%- end -%>
25  
-<%- if !ctx.inbox or !cell_phone? -%>
26  
-  <%- form_tag(link_action('archive')) do -%>
27  
-    <p><a name="top"></a><%= page_links(:for_top => true, :threads => @threads) %></p>
28  
-  <%- end -%>
  25
+<%- form_tag(link_action('archive')) do -%>
  26
+  <p><a name="top"></a><%= page_links(:for_top => true, :threads => @threads) %></p>
29 27
 <%- end -%>
30 28
 <div class="listings">
31 29
   <%- if link = geo_markers_link(@threads) -%>
2  tool/download_icons.rb
@@ -18,6 +18,8 @@
18 18
 save_as.call('http://friendfeed.com/static/images/icons/internal.png', 'internal')
19 19
 
20 20
 JSON.parse(httpclient.get_content('http://friendfeed.com/api/services'))['services'].each do |service|
  21
+  puts JSON.pretty_generate(service)
  22
+  next
21 23
   url = service['iconUrl']
22 24
   #name = service['name']
23 25
   name = url.scan(%r[/([^/]+).png])[0][0]

0 notes on commit 1fc49b2

Please sign in to comment.
Something went wrong with that request. Please try again.