t#29325:add server result

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b7496a2..4ba05ae 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,6 +3,10 @@ class ApplicationController < ActionController::Base
   before_filter :bf
   
   def bf
+    @server_result = {
+      :location => {:controller => params[:controller], :action => params[:action]}
+    }
+    @server_result[:location][:id] = params[:id] if params[:id]
     if Admin.count.to_i == 0 or License.count.to_i == 0
       if params[:controller] == 'system' and params[:action] == 'start'
       else

diff --git a/app/views/comics/edit.html.erb b/app/views/comics/edit.html.erb
index e2e2032..2b9cb6c 100644 (file)
--- a/app/views/comics/edit.html.erb
+++ b/app/views/comics/edit.html.erb
@@ -1,7 +1,4 @@
 <h1>edit comic</h1>
 
 <%= render 'form' %>
-<script>
-var r=<%= @comic.to_json %>;
-</script>
 <%= link_to 'Back', comics_path %>

diff --git a/app/views/comics/new.html.erb b/app/views/comics/new.html.erb
index c196a28..00a4e2a 100644 (file)
--- a/app/views/comics/new.html.erb
+++ b/app/views/comics/new.html.erb
@@ -1,6 +1,5 @@
 <h1>New comic</h1>
 
 <%= render 'form' %>
-<%= javascript_tag 'var r=' + @comic.errors.to_json + ';' %>
 
 <%= link_to 'Back', comics_path %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b363ebd..5d5dcd9 100644 (file)
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -17,6 +17,7 @@
                </div>\r
                <div id="esc-msg" style="border:1px red solid;padding:10px;margin:10px;cursor:pointer;">[ESC] キーを押すと Metro ホームに入るよ．ホームの一番最後のタイルをクリックすると このページに戻るよ．</div>\r
                <div id="server-page-close-button" class="button" style="width:100px;margin:1em;">ホームへ</div>\r
+   <%= javascript_tag 'var server_result=' + @server_result.to_json + ';' %>\r
                <%= javascript_include_tag "jquery-1.6.2.min" %>\r
                <%= javascript_include_tag "system" %>\r
                <% if current_user %>\r

diff --git a/app/views/layouts/test.html.erb b/app/views/layouts/test.html.erb
index a0e3870..110c475 100644 (file)
--- a/app/views/layouts/test.html.erb
+++ b/app/views/layouts/test.html.erb
@@ -52,8 +52,7 @@
 <%= link_to 'system_pictures', main_app.system_pictures_path %>\r
 </div>\r
 <%= yield %>\r
-<%= params[:controller] %>\r
-<%= params[:action] %>\r
+<%= javascript_tag 'var server_result=' + @server_result.to_json + ';' %>\r
 \r
 </body>\r
 </html>\r