From b5a5c9fd340ea6ee6b63122d9acf80fd2a763c8a Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 30 Mar 2017 17:27:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AE=9E=E8=AE=AD=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=A8=A1=E5=BC=8F=EF=BC=8C=E6=94=B9=E6=88=90=E7=9B=B4?= =?UTF-8?q?=E8=AF=BB=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 8 ++++---- app/views/games/_myshixun_repository.html.erb | 3 +-- app/views/games/entry.html.erb | 14 -------------- app/views/games/file_edit.js.erb | 14 +++++++------- 4 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 app/views/games/entry.html.erb diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 48af72ae5..2862f2695 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -61,10 +61,10 @@ class GamesController < ApplicationController end def file_edit - entry_and_raw(false) - @content = @repository.cat(@path, @rev).strip - # respond_to do |format| - # format.js + # entry_and_raw(false) + # @content = @repository.cat(@path, @rev).strip + # # respond_to do |format| + # # format.js # end end diff --git a/app/views/games/_myshixun_repository.html.erb b/app/views/games/_myshixun_repository.html.erb index b292bd0ab..121df51f8 100644 --- a/app/views/games/_myshixun_repository.html.erb +++ b/app/views/games/_myshixun_repository.html.erb @@ -4,8 +4,7 @@
<% if params[:action] == "entry" || @file_open %> - - + <% end %>
diff --git a/app/views/games/entry.html.erb b/app/views/games/entry.html.erb deleted file mode 100644 index a0945278a..000000000 --- a/app/views/games/entry.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %> -
-
- -
- <%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir'} %> -
-
- <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %> - <% content_for :header_tags do %> - <%= stylesheet_link_tag "scm" %> - <% end %> -
-
diff --git a/app/views/games/file_edit.js.erb b/app/views/games/file_edit.js.erb index 2fe45ed6f..4703617f8 100644 --- a/app/views/games/file_edit.js.erb +++ b/app/views/games/file_edit.js.erb @@ -1,7 +1,7 @@ -$("#file_entry_content").html('<%= escape_javascript(render :partial => 'games/file_edit_form') %>'); -$("#file_entry_content_inner").html('<%= escape_javascript(render :partial => 'games/extend_file_edit_form') %>'); -$("#sava_edit_btn1").show(); -$("#sava_edit_btn").show(); -$("#bottom_save_edit").show(); -editor_CodeMirror.refresh(); -editor.refresh(); \ No newline at end of file +//$("#file_entry_content").html('<%#= escape_javascript(render :partial => 'games/file_edit_form') %>'); +//$("#file_entry_content_inner").html('<%#= escape_javascript(render :partial => 'games/extend_file_edit_form') %>'); +//$("#sava_edit_btn1").show(); +//$("#sava_edit_btn").show(); +//$("#bottom_save_edit").show(); +//editor_CodeMirror.refresh(); +//editor.refresh(); \ No newline at end of file