diff --git a/app/views/challenges/_task_pass_form.html.erb b/app/views/challenges/_task_pass_form.html.erb
index f4d13beff..db5b04874 100644
--- a/app/views/challenges/_task_pass_form.html.erb
+++ b/app/views/challenges/_task_pass_form.html.erb
@@ -1,5 +1,5 @@
 <%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %>
-<%= javascript_include_tag '/editormd/editormd.min.js','/editormd/examples/js/jquery.min.js' %>
+<%= javascript_include_tag '/editormd/editormd','/editormd/examples/js/jquery.min.js' %>
 <style>
     .CodeMirror-scroll{
         overflow: auto !important;
diff --git a/app/views/layouts/base_edu.html.erb b/app/views/layouts/base_edu.html.erb
index 0fe58c7f0..e6e1c2dc4 100644
--- a/app/views/layouts/base_edu.html.erb
+++ b/app/views/layouts/base_edu.html.erb
@@ -30,7 +30,7 @@
     });
   </script>
 </head>
-<body onload="prettyPrint();">
+<body onload="prettyPrint();" style="height: 100%">
 <div class="newContainer">    <!-- 页面全部内容 -->
   <div class="newHeader">     <!-- 头部 -->
     <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %>
diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb
index 9eacf107a..2b5e6831a 100644
--- a/app/views/layouts/base_myshixun.html.erb
+++ b/app/views/layouts/base_myshixun.html.erb
@@ -16,7 +16,7 @@
   <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
-<body onload="setupAjaxIndicator();">
+<body onload="setupAjaxIndicator();" style="height: 100%">
 <div class="cl"></div>
 
 <div class="page -layout-v -fit ">
diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb
index 43fabec25..170293b43 100644
--- a/app/views/layouts/base_shixun.html.erb
+++ b/app/views/layouts/base_shixun.html.erb
@@ -15,7 +15,7 @@
   <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
-<body onload="prettyPrint();">
+<body onload="prettyPrint();" style="height: 100%">
 <div class="newContainer">    <!-- 页面全部内容 -->
   <div class="newHeader">     <!-- 头部 -->
     <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %>
diff --git a/app/views/layouts/base_subject.html.erb b/app/views/layouts/base_subject.html.erb
index 1b27ea123..0af65c9d1 100644
--- a/app/views/layouts/base_subject.html.erb
+++ b/app/views/layouts/base_subject.html.erb
@@ -18,7 +18,7 @@
   <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
-<body onload="prettyPrint();">
+<body onload="prettyPrint();" style="height: 100%;">
 <div class="newContainer edu-bg">    <!-- 页面全部内容 -->
   <div class="newHeader">     <!-- 头部 -->
     <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %>
diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb
index 903d2083f..224eb23c9 100644
--- a/app/views/shixuns/_form.html.erb
+++ b/app/views/shixuns/_form.html.erb
@@ -1,5 +1,5 @@
 <%= stylesheet_link_tag '/editormd/css/editormd' %>
-<%= javascript_include_tag '/editormd/editormd.min.js' %>
+<%= javascript_include_tag '/editormd/editormd' %>
 <div class="edu-con-bg01 user_bg_shadow mb20" style="padding:30px 0;">
   <div class="ml30 mr30">
     <div>
diff --git a/public/editormd/editormd.js b/public/editormd/editormd.js
index 42bd32616..18ebd0bd3 100644
--- a/public/editormd/editormd.js
+++ b/public/editormd/editormd.js
@@ -4451,7 +4451,7 @@
         }
 
         editormd.dialogZindex += 2;
-
+        $("body").removeAttr("style");
         return dialog;
     };
     
diff --git a/public/javascripts/edu/shixun.js b/public/javascripts/edu/shixun.js
index c440b21d3..459901f88 100644
--- a/public/javascripts/edu/shixun.js
+++ b/public/javascripts/edu/shixun.js
@@ -1,5 +1,5 @@
 $(function() {
-    $("#search_not_collaborators").live('input', function (e) {
+    $("#search_not_collaborators").on('input', function (e) {
         throttle(search_not_teacher_f, window, e);
     });
 });
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index 6f52eb44c..c72b7be36 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -1,5 +1,6 @@
 @charset "utf-8";
-html,body{ font-size:14px; line-height:2.0; height:100%;}
+body{font-size:14px; line-height:2.0;}
+html{height:100%;}
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
 .newMain{ margin: 0 auto; padding-bottom: 155px; }
 .newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px}
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index 4e87d1d4a..5e56e2105 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -1,5 +1,6 @@
 /************新版公共****************/
-html,body{ font-size:14px; line-height:2.0; height:100%;}
+body{font-size:14px; line-height:2.0;}
+html{height:100%;}
 /*.newContainer{ min-height:100%; height: auto !important; height: 100%;  position: relative;}
 .newMain{ margin: 0 auto; padding-bottom: 155px; }
 .newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px}
