From 4cc2a7688e0adff37a8d44e7a1e3d15deae95fd2 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 21 Aug 2017 15:41:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=AE=9E=E8=AE=AD=E6=97=B6?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=9B=BE=E7=89=87=E7=9A=84=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/games/_repository.html.erb | 21 ++++++++++++---------
 app/views/shixuns/_form.html.erb     |  2 +-
 public/editormd/css/editormd.css     |  1 +
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb
index 96b14aa62..029d7c924 100644
--- a/app/views/games/_repository.html.erb
+++ b/app/views/games/_repository.html.erb
@@ -28,9 +28,9 @@
   </div>
   <div class="-flex -relative">
     <div class="fit">
-     <!-- <div class="-layout-v -fit loading-center undis" id="coding_ajax_loading">
-        <embed src='/images/bigdata/loading2.svg' />
-      </div>-->
+      <!-- <div class="-layout-v -fit loading-center undis" id="coding_ajax_loading">
+         <embed src='/images/bigdata/loading2.svg' />
+       </div>-->
       <div class="-layout-v -fit" id="coding_area">
         <div  class="-flex">
           <div class="content-editor-inner">
@@ -52,10 +52,12 @@
 <div id="codetab_con_2" class="undis -relative"></div>
 <div id="current_repository_path" class="undis"><%= file_update_myshixun_game_path(@game, :myshixun_id => @myshixun, :path => @path)  %></div>
 <script>
-  $(function(){
-      LoadingWebssh();
-  });
-  var H = 2;
+    $(function(){
+        <% if @myshixun.shixun.try(:webssh) %>
+            LoadingWebssh();
+        <% end %>
+    });
+    var H = 2;
     function g_l(o){return document.getElementById(o);}
     function HoverLi_new(n){
         console.log("n:" + n);
@@ -138,10 +140,11 @@
                     var html = "<iframe src='<%= Redmine::Configuration['webssh'] %>/?Host=" + data.host + "&Port=" + data.port + "&Username=" + data.username + "&Password=" + data.password + "&Gameid=" + data.game_id + "&rows=" + rows + "'" + " style='width:100%;border:0;' scrolling='no'  class='game_webssh'></iframe><div class='-brother undis'></div>";
                     // 本地版
                     var html_local ="<iframe src='http://127.0.0.1:9527?Host=106.75.96.108&Port=40054&Username=root&Password=123123&Gameid=" +data.game_id + "&rows=" + rows + "'" + " style='width:100%;border:0;' scrolling='no' class='game_webssh'></iframe><div class='-brother undis'></div>";
-                   // $("#LazyLoading").remove();
+                    // $("#LazyLoading").remove();
+                    console.log(html);
                     $("#codetab_con_"+H).html(html);
                     $(".game_webssh").css("min-height", h);
-                   // HoverLi_new(2);
+                    // HoverLi_new(2);
 
                 }
             }
diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb
index 571e4f9e1..903d2083f 100644
--- a/app/views/shixuns/_form.html.erb
+++ b/app/views/shixuns/_form.html.erb
@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %>
+<%= stylesheet_link_tag '/editormd/css/editormd' %>
 <%= javascript_include_tag '/editormd/editormd.min.js' %>
 <div class="edu-con-bg01 user_bg_shadow mb20" style="padding:30px 0;">
   <div class="ml30 mr30">
diff --git a/public/editormd/css/editormd.css b/public/editormd/css/editormd.css
index 9642bb7b3..7e6f22c4b 100644
--- a/public/editormd/css/editormd.css
+++ b/public/editormd/css/editormd.css
@@ -55,6 +55,7 @@
   -moz-appearance: none;
   -ms-appearance: none;
   appearance: none;
+  line-height: normal;
 }
 .editormd ::-webkit-scrollbar {
   height: 10px;