From 77ea22173e4322b79769d15a643f7d2cb12f4d32 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 1 Sep 2017 09:16:35 +0800
Subject: [PATCH] @myshixun.shixun.language == "Html"

---
 app/controllers/iframes_controller.rb    | 2 ++
 app/views/games/_code_actions.html.erb   | 6 ++++--
 app/views/games/_file_edit_form.html.erb | 3 +++
 config/routes.rb                         | 1 -
 public/javascripts/edu/edu_tpi.js        | 5 ++++-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/controllers/iframes_controller.rb b/app/controllers/iframes_controller.rb
index 9fed6add6..2d1091219 100644
--- a/app/controllers/iframes_controller.rb
+++ b/app/controllers/iframes_controller.rb
@@ -1,5 +1,7 @@
 class IframesController < ApplicationController
   layout false
+  skip_before_filter :verify_authenticity_token, :only => [:html_content]
+
   def show
     render :layout => false
   end
diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb
index 26b81d68a..77125254e 100644
--- a/app/views/games/_code_actions.html.erb
+++ b/app/views/games/_code_actions.html.erb
@@ -32,12 +32,14 @@
 <script>
     // 如果是HTML实训，则在效果显示栏实时渲染code
     <% if @shixun.language == "Html" %>
-    setTimeout(tpi_html_show, 1000);
+        setTimeout(tpi_html_show, 1000);
     <% end %>
     // 渲染用户的HTML的CODE。
     function tpi_html_show(){
         var contents = editor_CodeMirror.getValue();
-        $("#html_contents").attr("src", "/iframes/html_content?contents="+contents);
+        $("#data_param").val(contents);
+        $("#html_form").attr("action", "/iframes/html_content");
+        $("#html_form").submit();
     }
     /* -------------- 点击加载上次通过的代码----------------*/
     $("#task_popup_confirm").live("click", function(){
diff --git a/app/views/games/_file_edit_form.html.erb b/app/views/games/_file_edit_form.html.erb
index 9876917e5..886aa15b4 100644
--- a/app/views/games/_file_edit_form.html.erb
+++ b/app/views/games/_file_edit_form.html.erb
@@ -123,6 +123,9 @@
     // codemmirror键盘按下事件，用来触发自动补全代码功能
     editor_CodeMirror.on("keyup", function(editor, event)
     {
+        <% if @myshixun.shixun.language == "Html" %>
+            return;
+        <% end %>
         var __Cursor = editor.getDoc().getCursor();
         var __Token = editor.getTokenAt(__Cursor);
         /*      // 当前行变化时，codemirror的js会改变gutter的结构，因此要在此需要再增加标示
diff --git a/config/routes.rb b/config/routes.rb
index 2f9340f04..ab9e0cdbf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -159,7 +159,6 @@ RedmineApp::Application.routes.draw do
 
   resources :iframes do
     collection do
-
       match 'html_content', :via => [:get, :post]
     end
   end
diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js
index 14153512b..79944c251 100644
--- a/public/javascripts/edu/edu_tpi.js
+++ b/public/javascripts/edu/edu_tpi.js
@@ -376,7 +376,10 @@ function code_evaluation(test_sets,
     $b = "<div class=\"fit -scroll\">" +
         "<div class=\"-layout-v -fit\">" +
         "<div class=\"-flex -scroll task-padding16 loading-center undis\" id=\"html_ajax_loading\"></div>" +
-        "<iframe frameborder=\"0\" name=\"i\" src=\"/iframes/html_content\" id=\"html_contents\" style='background: #fff;height: 100%;'>" +
+        "<form id=\"html_form\" method=\"post\" target=\"myFrame\">" +
+        "<input type=\"hidden\" name=\"contents\" id=\"data_param\" />" +
+        "</form>" +
+        "<iframe frameborder=\"0\" name=\"myFrame\" style='background: #fff;height: 100%;'>" +
         "</iframe>" +
         "</div>" +
         "</div>";