From 742506f52b8fd000f8d4160ed50e9ed8c523cd95 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 16 Jun 2015 21:13:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?IE8=E4=B8=8D=E8=83=BD=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 6 +- app/views/student_work/edit.html.erb | 4 +- config/settings.yml | 6 + public/javascripts/attachments.js | 257 +++++++++++++++++--------- 4 files changed, 181 insertions(+), 92 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 20b855fd8..9ce107f8b 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -219,7 +219,7 @@ class WelcomeController < ApplicationController # 判断网站的入口，是课程 course 则跳过index去渲染 course 方法 def entry_select url = request.original_url.gsub('/','') - if url.include?(Setting.host_course.gsub('/','')) + if url.include?(Setting.url_course.gsub('/','')) if @first_page.show_course == 1 course render :course @@ -228,7 +228,7 @@ class WelcomeController < ApplicationController end return 0 - elsif url.include?(Setting.host_contest.gsub('/','')) + elsif url.include?(Setting.url_contest.gsub('/','')) if @first_page.show_contest == 1 contest render :contest @@ -237,7 +237,7 @@ class WelcomeController < ApplicationController end return 0 - elsif url.include?(Setting.host_user.gsub('/','')) + elsif url.include?(Setting.url_user.gsub('/','')) #redirect_to(:controller => "users", :action => "index") end diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb index f63c1792b..dfa995f47 100644 --- a/app/views/student_work/edit.html.erb +++ b/app/views/student_work/edit.html.erb @@ -12,7 +12,7 @@
- <%= labelled_form_for @work do |f|%> + <%= labelled_form_for @work,:html => { :multipart => true } do |f|%>

@@ -57,4 +57,4 @@

-
\ No newline at end of file +
diff --git a/config/settings.yml b/config/settings.yml index cf98025e0..f952e23bf 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -89,6 +89,12 @@ host_user: default: user.trustie.net host_repository: default: repository.trustie.net +url_course: + default: course.trustie.net +url_contest: + default: contest.trustie.net +url_user: + default: user.trustie.net protocol: default: http feeds_limit: diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 3df755a7f..9c32e41dc 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -1,8 +1,7 @@ /* Redmine - project management software Copyright (C) 2006-2013 Jean-Philippe Lang */ -function postUpMsg(attachmentId) -{ +function postUpMsg(attachmentId) { $.ajax({ url: '/attachments/renderTag', type: "GET", @@ -30,28 +29,57 @@ function addFile_board(inputEl, file, eagerUpload, id) { deleteallfiles = $(inputEl).data('deleteAllFiles'); var attachmentId = addFile.nextAttachmentId++; - var fileSpan = $('', { 'id': 'attachments_' + attachmentId, 'class':'attachment' }); + var fileSpan = $('', { + 'id': 'attachments_' + attachmentId, + 'class': 'attachment' + }); fileSpan.append( - $('', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name), - $('', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('descriptionPlaceholder') } ).toggle(!eagerUpload), - $(''+$(inputEl).data('fieldIsPublic')+':').attr({ 'class': 'ispublic-label' }) , - $('', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload), - $(' ').attr({ 'href': "#", 'class': 'remove-upload', 'data-containerid':id }).click(function(){ - if(confirm($(inputEl).data('areYouSure'))){ + $('', { + 'type': 'text', + 'class': 'filename readonly', + 'name': 'attachments[' + attachmentId + '][filename]', + 'readonly': 'readonly' + }).val(file.name), + $('', { + 'type': 'text', + 'class': 'description', + 'name': 'attachments[' + attachmentId + '][description]', + 'maxlength': 254, + 'placeholder': $(inputEl).data('descriptionPlaceholder') + }).toggle(!eagerUpload), + $('' + $(inputEl).data('fieldIsPublic') + ':').attr({ + 'class': 'ispublic-label' + }), + $('', { + 'type': 'checkbox', + 'class': 'is_public_checkbox', + 'value': 1, + 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', + checked: 'checked' + }).toggle(!eagerUpload), + $(' ').attr({ + 'href': "#", + 'class': 'remove-upload', + 'data-containerid': id + }).click(function() { + if (confirm($(inputEl).data('areYouSure'))) { removeFile(); - if(!eagerUpload){ - (function(e){ + if (!eagerUpload) { + (function(e) { reload(e); })(fileSpan); } } }).toggle(!eagerUpload), - $('
', { 'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} ) + $('
', { + 'class': 'div_attachments', + 'name': 'div_' + 'attachments_' + attachmentId + }) ).appendTo(attachments_frame); - if(eagerUpload) { + if (eagerUpload) { ajaxUpload(file, attachmentId, fileSpan, inputEl); } @@ -59,6 +87,7 @@ function addFile_board(inputEl, file, eagerUpload, id) { } return null; } + function addFile(inputEl, file, eagerUpload) { var attachments_frame = '#attachments_fields'; @@ -66,28 +95,56 @@ function addFile(inputEl, file, eagerUpload) { deleteallfiles = $(inputEl).data('deleteAllFiles'); var attachmentId = addFile.nextAttachmentId++; - var fileSpan = $('', { 'id': 'attachments_' + attachmentId, 'class':'attachment' }); + var fileSpan = $('', { + 'id': 'attachments_' + attachmentId, + 'class': 'attachment' + }); fileSpan.append( - $('', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name), - $('', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('descriptionPlaceholder') } ).toggle(!eagerUpload), - $(''+$(inputEl).data('fieldIsPublic')+':').attr({ 'class': 'ispublic-label' }) , - $('', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload), - $(' ').attr({ 'href': "#", 'class': 'remove-upload' }).click(function(){ - if(confirm($(inputEl).data('areYouSure'))){ + $('', { + 'type': 'text', + 'class': 'filename readonly', + 'name': 'attachments[' + attachmentId + '][filename]', + 'readonly': 'readonly' + }).val(file.name), + $('', { + 'type': 'text', + 'class': 'description', + 'name': 'attachments[' + attachmentId + '][description]', + 'maxlength': 254, + 'placeholder': $(inputEl).data('descriptionPlaceholder') + }).toggle(!eagerUpload), + $('' + $(inputEl).data('fieldIsPublic') + ':').attr({ + 'class': 'ispublic-label' + }), + $('', { + 'type': 'checkbox', + 'class': 'is_public_checkbox', + 'value': 1, + 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', + checked: 'checked' + }).toggle(!eagerUpload), + $(' ').attr({ + 'href': "#", + 'class': 'remove-upload' + }).click(function() { + if (confirm($(inputEl).data('areYouSure'))) { removeFile(); - if(!eagerUpload){ - (function(e){ + if (!eagerUpload) { + (function(e) { reload(e); })(fileSpan); } } }).toggle(!eagerUpload), - $('
', { 'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} ) + $('
', { + 'class': 'div_attachments', + 'name': 'div_' + 'attachments_' + attachmentId + }) ).appendTo('#attachments_fields'); - if(eagerUpload) { + if (eagerUpload) { ajaxUpload(file, attachmentId, fileSpan, inputEl); } @@ -106,8 +163,8 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { } function onProgress(e) { - if(e.lengthComputable) { - this.progressbar( 'value', e.loaded * 100 / e.total ); + if (e.lengthComputable) { + this.progressbar('value', e.loaded * 100 / e.total); } } @@ -116,18 +173,17 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { ajaxUpload.uploading++; uploadBlob(file, $(inputEl).data('upload-path'), attachmentId, { - loadstartEventHandler: onLoadstart.bind(progressSpan), - progressEventHandler: onProgress.bind(progressSpan) - }) + loadstartEventHandler: onLoadstart.bind(progressSpan), + progressEventHandler: onProgress.bind(progressSpan) + }) .done(function(result) { - progressSpan.progressbar( 'value', 100 ).remove(); + progressSpan.progressbar('value', 100).remove(); fileSpan.find('input.description, a').css('display', 'inline-block'); fileSpan.find('input.is_public_checkbox, a').css('display', 'inline-block'); }) .fail(function(result) { progressSpan.text(result.statusText); - if($("#network_issue")) - { + if ($("#network_issue")) { $("#network_issue").show(); } }).always(function() { @@ -143,33 +199,37 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { //gcm files count and add delete_all link //modify by yutao 2015-5-14 1ҳڶϴؼʱ˿bug ʸ֮ start - var containerid=$(inputEl).data('containerid'); - if(containerid==undefined){ - var count=$('#attachments_fields>span').length; - $('#upload_file_count').html(""+count+""+$(inputEl).data('fileCount')); - if(count>=1){ - var add_attachs=$('.add_attachment'); - var delete_all=$('.remove_all'); - if(delete_all.length<1){ - add_attachs.append($(" ").attr({"href":"javascript:void(0)", 'class': 'remove_all',"onclick": "removeAll()"})); + var containerid = $(inputEl).data('containerid'); + if (containerid == undefined) { + var count = $('#attachments_fields>span').length; + $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); + if (count >= 1) { + var add_attachs = $('.add_attachment'); + var delete_all = $('.remove_all'); + if (delete_all.length < 1) { + add_attachs.append($(" ").attr({ + "href": "javascript:void(0)", + 'class': 'remove_all', + "onclick": "removeAll()" + })); } } - }else{ - var count=$('#attachments_fields'+containerid+'>span').length; - $('#upload_file_count'+containerid).html(""+count+""+$(inputEl).data('fileCount')); - if(count>=1){ - var add_attachs=$('.add_attachment').filter(function(index){ - return $(this).data('containerid')==containerid; + } else { + var count = $('#attachments_fields' + containerid + '>span').length; + $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); + if (count >= 1) { + var add_attachs = $('.add_attachment').filter(function(index) { + return $(this).data('containerid') == containerid; }); - var delete_all=$('.remove_all').filter(function(index){ - return $(this).data('containerid')==containerid; + var delete_all = $('.remove_all').filter(function(index) { + return $(this).data('containerid') == containerid; }); - if(delete_all.length<1){ + if (delete_all.length < 1) { add_attachs.append($(" ").attr({ - "href":"javascript:void(0)", + "href": "javascript:void(0)", 'class': 'remove_all', 'data-containerid': containerid, - "onclick": "removeAll('"+containerid+"')" + "onclick": "removeAll('" + containerid + "')" })); } } @@ -186,7 +246,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { var maxSyncUpload = $(inputEl).data('max-concurrent-uploads'); - if(maxSyncUpload == null || maxSyncUpload <= 0 || ajaxUpload.uploading < maxSyncUpload) + if (maxSyncUpload == null || maxSyncUpload <= 0 || ajaxUpload.uploading < maxSyncUpload) actualUpload(file, attachmentId, fileSpan, inputEl); else $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl)); @@ -201,23 +261,23 @@ function removeFile() { //gcm delete all file //modify by yutao 2015-5-14 1ҳڶϴؼʱ˿bug ʸ֮ start -function removeAll(containerid){ - if(confirm(deleteallfiles)){ - if(containerid==undefined){ - $(".remove-upload").removeAttr("data-confirm"); - $(".remove-upload").click(); - }else{ - var arr = $(".remove-upload").filter(function(){ - return $(this).data('containerid')==containerid; - }); - arr.removeAttr("data-confirm"); - arr.click(); +function removeAll(containerid) { + if (confirm(deleteallfiles)) { + if (containerid == undefined) { + $(".remove-upload").removeAttr("data-confirm"); + $(".remove-upload").click(); + } else { + var arr = $(".remove-upload").filter(function() { + return $(this).data('containerid') == containerid; + }); + arr.removeAttr("data-confirm"); + arr.click(); + } } + // return false; } -// return false; -} -//modify by yutao 2015-5-14 1ҳڶϴؼʱ˿bug ʸ֮ end -//gcm + //modify by yutao 2015-5-14 1ҳڶϴؼʱ˿bug ʸ֮ end + //gcm function uploadBlob(blob, uploadUrl, attachmentId, options) { @@ -225,9 +285,9 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) { loadstartEventHandler: $.noop, progressEventHandler: $.noop }, options); - if(uploadUrl.indexOf('?') > 0){ + if (uploadUrl.indexOf('?') > 0) { uploadUrl = uploadUrl + '&attachment_id=' + attachmentId; - }else{ + } else { uploadUrl = uploadUrl + '?attachment_id=' + attachmentId; } if (blob instanceof window.File) { @@ -254,7 +314,6 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) { function addInputFiles(inputEl) { // var clearedFileInput = $(inputEl).clone().val(''); - if (inputEl.files) { // upload files using ajax uploadAndAttachFiles(inputEl.files, inputEl); @@ -263,15 +322,22 @@ function addInputFiles(inputEl) { // browser not supporting the file API, upload on form submission var attachmentId; var aFilename = inputEl.value.split(/\/|\\/); - attachmentId = addFile(inputEl, { name: aFilename[ aFilename.length - 1 ] }, false); + var count = $('#attachments_fields>span').length; + attachmentId = addFile(inputEl, { + name: aFilename[aFilename.length - 1] + }, false); if (attachmentId) { - $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]'}).hide(); - $('#upload_file_count').html(""+count+""+$(inputEl).data('fileCount')); + $(inputEl).attr({ + name: 'attachments[' + attachmentId + '][file]' + }).hide(); + if (count <= 0) count = 1; + $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); } } //clearedFileInput.insertAfter('#attachments_fields'); } + function addInputFiles_board(inputEl, id) { // var clearedFileInput = $(inputEl).clone().val(''); @@ -283,15 +349,20 @@ function addInputFiles_board(inputEl, id) { // browser not supporting the file API, upload on form submission var attachmentId; var aFilename = inputEl.value.split(/\/|\\/); - attachmentId = addFile_board(inputEl, { name: aFilename[ aFilename.length - 1 ] }, false, id); + attachmentId = addFile_board(inputEl, { + name: aFilename[aFilename.length - 1] + }, false, id); if (attachmentId) { - $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]'}).hide(); - $('#upload_file_count').html(""+count+""+$(inputEl).data('fileCount')); + $(inputEl).attr({ + name: 'attachments[' + attachmentId + '][file]' + }).hide(); + $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); } } //clearedFileInput.insertAfter('#attachments_fields'); } + function uploadAndAttachFiles(files, inputEl) { var maxFileSize = $(inputEl).data('max-file-size'); @@ -299,14 +370,19 @@ function uploadAndAttachFiles(files, inputEl) { var sizeExceeded = false; $.each(files, function() { - if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {sizeExceeded=true;} + if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) { + sizeExceeded = true; + } }); if (sizeExceeded) { window.alert(maxFileSizeExceeded); } else { - $.each(files, function() {addFile(inputEl, this, true);}); + $.each(files, function() { + addFile(inputEl, this, true); + }); } } + function uploadAndAttachFiles_board(files, inputEl, id) { var maxFileSize = $(inputEl).data('max-file-size'); @@ -314,14 +390,19 @@ function uploadAndAttachFiles_board(files, inputEl, id) { var sizeExceeded = false; $.each(files, function() { - if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {sizeExceeded=true;} + if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) { + sizeExceeded = true; + } }); if (sizeExceeded) { window.alert(maxFileSizeExceeded); } else { - $.each(files, function() {addFile_board(inputEl, this, true, id);}); + $.each(files, function() { + addFile_board(inputEl, this, true, id); + }); } } + function handleFileDropEvent(e) { $(this).removeClass('fileover'); @@ -345,7 +426,9 @@ function dragOutHandler(e) { function setupFileDrop() { if (window.File && window.FileList && window.ProgressEvent && window.FormData) { - $.event.fixHooks.drop = { props: [ 'dataTransfer' ] }; + $.event.fixHooks.drop = { + props: ['dataTransfer'] + }; $('form div.box').has('input:file').each(function() { $(this).on({ @@ -358,18 +441,18 @@ function setupFileDrop() { } $(document).ready(setupFileDrop); -$(function(){ +$(function() { $(".file_selector").each(function() { deleteallfiles = $(this).data('deleteAllFiles'); var containerid = $(this).data('containerid'); - if (containerid == undefined)containerid = ''; + if (containerid == undefined) containerid = ''; var count = $('#attachments_fields' + containerid + '>span').length; if (count >= 1) { $('#upload_file_count' + containerid).html("" + count + "" + $(this).data('fileCount')); - var add_attachs = $('.add_attachment').filter(function (index) { + var add_attachs = $('.add_attachment').filter(function(index) { return $(this).data('containerid') == containerid; }); - var delete_all = $('.remove_all').filter(function (index) { + var delete_all = $('.remove_all').filter(function(index) { return $(this).data('containerid') == containerid; }); if (delete_all.length < 1) { @@ -383,4 +466,4 @@ $(function(){ } }); -}); \ No newline at end of file +}); From d793a8119ad23f6d6beeb97f3628b17455090d2a Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Wed, 17 Jun 2015 17:01:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B2=98=E5=9B=BE?= =?UTF-8?q?=E7=9A=84=E5=8A=A0=E8=BD=BD=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/edit.html.erb | 4 +- app/views/boards/show.html.erb | 4 +- app/views/courses/_courses_jours.html.erb | 4 +- app/views/forums/edit.html.erb | 2 +- app/views/forums/new.html.erb | 2 +- app/views/homework_common/edit.html.erb | 4 +- app/views/homework_common/new.html.erb | 4 +- app/views/issues/new.html.erb | 2 +- app/views/issues/show.html.erb | 2 +- app/views/layouts/base_forums.html.erb | 2 +- app/views/memos/edit.html.erb | 2 +- app/views/memos/new.html.erb | 2 +- app/views/memos/show.html.erb | 2 +- app/views/messages/_form_course.html.erb | 2 +- app/views/news/_course_form.html.erb | 4 +- app/views/news/_course_show.html.erb | 4 +- app/views/news/_project_form.html.erb | 4 +- app/views/news/edit.html.erb | 4 +- app/views/projects/_project_jours.html.erb | 4 +- app/views/users/_user_jours.html.erb | 2 +- .../lib/rails_kindeditor/helper.rb | 7 +- public/assets/kindeditor/kindeditor.js | 3 + public/assets/kindeditor/pasteimg.js | 385 ++++++++++++++++++ 23 files changed, 422 insertions(+), 33 deletions(-) create mode 100644 public/assets/kindeditor/pasteimg.js diff --git a/app/views/bids/edit.html.erb b/app/views/bids/edit.html.erb index 37121d720..da3d19267 100644 --- a/app/views/bids/edit.html.erb +++ b/app/views/bids/edit.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%= labelled_form_for @bid,:html => { :multipart => true } do |f| %> <%= render :partial => 'new_homework_form', :locals => { :bid => @bid, :bid_id => "edit_bid_#{@bid.id}",:f=>f,:edit_mode => true} %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb index 10383ff00..b49b4a960 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -34,7 +34,7 @@ else if (window.attachEvent) window.attachEvent("onload", buildsubmenus) -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %> <% if @project %> @@ -227,4 +227,4 @@ function nh_init_board(params){ } - \ No newline at end of file + diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index 2cb22ce89..03adc2fd7 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -11,7 +11,7 @@ div.recall_con{width:570px;} div.recall_con .reply_btn{margin-left:525px;margin-top:5px;} -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
<%# reply_allow = JournalsForMessage.create_by_user? User.current %>

<%= l(:label_leave_message) %>

@@ -207,4 +207,4 @@ }); }); }); - \ No newline at end of file + diff --git a/app/views/forums/edit.html.erb b/app/views/forums/edit.html.erb index 9fe72fdb7..0a40120c7 100644 --- a/app/views/forums/edit.html.erb +++ b/app/views/forums/edit.html.erb @@ -1,4 +1,4 @@

编辑讨论区

-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%= render 'form_edit_mode' %> diff --git a/app/views/forums/new.html.erb b/app/views/forums/new.html.erb index 35814d843..9bce17416 100644 --- a/app/views/forums/new.html.erb +++ b/app/views/forums/new.html.erb @@ -5,7 +5,7 @@ <% @nav_dispaly_forum_label = 1%>

<%= l :label_forum_new %>

-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%= render 'form_create_mode' %> <%#= link_to l(:button_back), forums_path %> diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb index f9d3f8b70..50feca946 100644 --- a/app/views/homework_common/edit.html.erb +++ b/app/views/homework_common/edit.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%= error_messages_for 'homework_common' %>
@@ -13,4 +13,4 @@ <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%> <% end%>
-
\ No newline at end of file +
diff --git a/app/views/homework_common/new.html.erb b/app/views/homework_common/new.html.erb index b0fdc5299..dc67b5079 100644 --- a/app/views/homework_common/new.html.erb +++ b/app/views/homework_common/new.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%= error_messages_for 'homework_common' %>
@@ -14,4 +14,4 @@ <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%> <% end%>
-
\ No newline at end of file +
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb index 77f3baf31..26aff7d61 100644 --- a/app/views/issues/new.html.erb +++ b/app/views/issues/new.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>

<%= l(:label_issue_new) %>

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 59ad0b1d2..1bd956074 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>

<%= l(:label_issue_edit) %>

diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 4d79f50f9..fdeb609c8 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -12,7 +12,7 @@ <%= csrf_meta_tag %> <%= favicon %> - <%= javascript_include_tag "/assets/kindeditor/kindeditor" %> + <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index b7aa08abd..6fc361d27 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -1,6 +1,6 @@ <% @replying = !@memo.parent.nil? %> -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>

<%=l(:label_memo_edit)%>

<%= labelled_form_for(@memo, :url => forum_memo_path(@memo.forum_id, @memo)) do |f| %> <% if @memo.errors.any? %> diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb index 8a1863047..792c8d55a 100644 --- a/app/views/memos/new.html.erb +++ b/app/views/memos/new.html.erb @@ -4,7 +4,7 @@ @nav_dispaly_main_contest_label = 1 %> <% @nav_dispaly_forum_label = 1%> -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 05358c32a..55a2410b0 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -4,7 +4,7 @@ margin-bottom: 13px; } -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
<%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb index 1161e9f8a..7952e4820 100644 --- a/app/views/messages/_form_course.html.erb +++ b/app/views/messages/_form_course.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%= error_messages_for 'message' %> <% replying ||= false %> <% extra_option = replying ? { hidden: "hidden"} : { maxlength: 200 } %> diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb index 1769c98f3..0a5488714 100644 --- a/app/views/news/_course_form.html.erb +++ b/app/views/news/_course_form.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
  • @@ -37,4 +37,4 @@ <% end %>
    • - \ No newline at end of file + diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb index 4d1242883..f39eb8266 100644 --- a/app/views/news/_course_show.html.erb +++ b/app/views/news/_course_show.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>

    <%= l(:label_course_news) %>

    @@ -76,4 +76,4 @@ <% end %> -<% html_title @news.title -%> \ No newline at end of file +<% html_title @news.title -%> diff --git a/app/views/news/_project_form.html.erb b/app/views/news/_project_form.html.erb index b9698497d..dfe1fb937 100644 --- a/app/views/news/_project_form.html.erb +++ b/app/views/news/_project_form.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
  • @@ -33,4 +33,4 @@ <% end %>
    • - \ No newline at end of file + diff --git a/app/views/news/edit.html.erb b/app/views/news/edit.html.erb index 758976d1b..5fbae6f72 100644 --- a/app/views/news/edit.html.erb +++ b/app/views/news/edit.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>

    <%= l(:label_course_news) %>

    @@ -8,4 +8,4 @@ <%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %> <% end %>
    -
    \ No newline at end of file + diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb index 353223acd..93974579f 100644 --- a/app/views/projects/_project_jours.html.erb +++ b/app/views/projects/_project_jours.html.erb @@ -11,7 +11,7 @@ div.recall_con{width:570px;} div.recall_con .reply_btn{margin-left:525px;margin-top:5px;} -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
    <% reply_allow = JournalsForMessage.create_by_user? User.current %>

    <%= l(:label_user_response) %>

    @@ -196,4 +196,4 @@ }); }); }); - \ No newline at end of file + diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb index ee8d14841..aeb3a71ea 100644 --- a/app/views/users/_user_jours.html.erb +++ b/app/views/users/_user_jours.html.erb @@ -11,7 +11,7 @@ div.recall_con{width:600px;} div.recall_con .reply_btn{margin-left:555px;margin-top:5px;} -<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
    <% reply_allow = JournalsForMessage.create_by_user? User.current %> diff --git a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb index 1f4c867ba..d5f91ebf8 100644 --- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb +++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb @@ -16,7 +16,8 @@ module RailsKindeditor input_html = input_html.merge(style: 'display:none') output_buffer = ActiveSupport::SafeBuffer.new output_buffer << build_text_area_tag(name, method, self, options, input_html) - output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true'))) + output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true', + afterCreate: 'eval(function(){enablePasteImg(self);})'))) end def kindeditor_upload_json_path(*args) @@ -52,12 +53,12 @@ module RailsKindeditor "var old_onload_#{random_name}; if(typeof window.onload == 'function') old_onload_#{random_name} = window.onload; window.onload = function() { - #{editor_id}KindEditor.create('##{dom_id}', #{get_options(options).to_json}).loadPlugin('paste'); + #{editor_id}KindEditor.create('##{dom_id}', #{get_options(options).to_json}); if(old_onload_#{random_name}) old_onload_#{random_name}(); }" else "KindEditor.ready(function(K){ - #{editor_id}K.create('##{dom_id}', #{get_options(options).to_json}).loadPlugin('paste'); + #{editor_id}K.create('##{dom_id}', #{get_options(options).to_json}); });" end end diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 1695b10f7..a9633861e 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -5097,6 +5097,9 @@ KEditor.prototype = { } self.afterCreate(); if (self.options.afterCreate) { + if (typeof self.options.afterCreate == 'string'){ + self.options.afterCreate = eval(self.options.afterCreate); + } self.options.afterCreate.call(self); } } diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js new file mode 100644 index 000000000..c413bbcb9 --- /dev/null +++ b/public/assets/kindeditor/pasteimg.js @@ -0,0 +1,385 @@ +// Generated by CoffeeScript 1.9.0 + +/* +paste.js is an interface to read data ( text / image ) from clipboard in different browsers. It also contains several hacks. +https://github.com/layerssss/paste.js + */ + +(function() { + var $, Paste, createHiddenEditable, dataURLtoBlob; + + $ = window.jQuery; + + $.paste = function(pasteContainer) { + var pm; + if (typeof console !== "undefined" && console !== null) { + console.log("DEPRECATED: This method is deprecated. Please use $.fn.pastableNonInputable() instead."); + } + pm = Paste.mountNonInputable(pasteContainer); + return pm._container; + }; + + $.fn.pastableNonInputable = function() { + var el, _i, _len; + for (_i = 0, _len = this.length; _i < _len; _i++) { + el = this[_i]; + Paste.mountNonInputable(el); + } + return this; + }; + + $.fn.pastableTextarea = function() { + var el, _i, _len; + for (_i = 0, _len = this.length; _i < _len; _i++) { + el = this[_i]; + Paste.mountTextarea(el); + } + return this; + }; + + $.fn.pastableContenteditable = function() { + var el, _i, _len; + for (_i = 0, _len = this.length; _i < _len; _i++) { + el = this[_i]; + Paste.mountContenteditable(el); + } + return this; + }; + + dataURLtoBlob = function(dataURL, sliceSize) { + var b64Data, byteArray, byteArrays, byteCharacters, byteNumbers, contentType, i, m, offset, slice, _ref; + if (sliceSize == null) { + sliceSize = 512; + } + if (!(m = dataURL.match(/^data\:([^\;]+)\;base64\,(.+)$/))) { + return null; + } + _ref = m, m = _ref[0], contentType = _ref[1], b64Data = _ref[2]; + byteCharacters = atob(b64Data); + byteArrays = []; + offset = 0; + while (offset < byteCharacters.length) { + slice = byteCharacters.slice(offset, offset + sliceSize); + byteNumbers = new Array(slice.length); + i = 0; + while (i < slice.length) { + byteNumbers[i] = slice.charCodeAt(i); + i++; + } + byteArray = new Uint8Array(byteNumbers); + byteArrays.push(byteArray); + offset += sliceSize; + } + return new Blob(byteArrays, { + type: contentType + }); + }; + + createHiddenEditable = function() { + return $(document.createElement('div')).attr('contenteditable', true).css({ + width: 1, + height: 1, + position: 'fixed', + left: -100, + overflow: 'hidden' + }); + }; + + Paste = (function() { + Paste.prototype._target = null; + + Paste.prototype._container = null; + + Paste.mountNonInputable = function(nonInputable) { + var paste; + paste = new Paste(createHiddenEditable().appendTo(nonInputable), nonInputable); + $(nonInputable).on('click', (function(_this) { + return function() { + return paste._container.focus(); + }; + })(this)); + paste._container.on('focus', (function(_this) { + return function() { + return $(nonInputable).addClass('pastable-focus'); + }; + })(this)); + return paste._container.on('blur', (function(_this) { + return function() { + return $(nonInputable).removeClass('pastable-focus'); + }; + })(this)); + }; + + Paste.mountTextarea = function(textarea) { + var ctlDown, paste; + if (-1 !== navigator.userAgent.toLowerCase().indexOf('chrome')) { + return this.mountContenteditable(textarea); + } + paste = new Paste(createHiddenEditable().insertBefore(textarea), textarea); + ctlDown = false; + $(textarea).on('keyup', function(ev) { + var _ref; + if ((_ref = ev.keyCode) === 17 || _ref === 224) { + return ctlDown = false; + } + }); + $(textarea).on('keydown', function(ev) { + var _ref; + if ((_ref = ev.keyCode) === 17 || _ref === 224) { + ctlDown = true; + } + if (ctlDown && ev.keyCode === 86) { + return paste._container.focus(); + } + }); + $(paste._target).on('pasteImage', (function(_this) { + return function() { + return $(textarea).focus(); + }; + })(this)); + $(paste._target).on('pasteText', (function(_this) { + return function() { + return $(textarea).focus(); + }; + })(this)); + $(textarea).on('focus', (function(_this) { + return function() { + return $(textarea).addClass('pastable-focus'); + }; + })(this)); + return $(textarea).on('blur', (function(_this) { + return function() { + return $(textarea).removeClass('pastable-focus'); + }; + })(this)); + }; + + Paste.mountContenteditable = function(contenteditable) { + var paste; + paste = new Paste(contenteditable, contenteditable); + $(contenteditable).on('focus', (function(_this) { + return function() { + return $(contenteditable).addClass('pastable-focus'); + }; + })(this)); + return $(contenteditable).on('blur', (function(_this) { + return function() { + return $(contenteditable).removeClass('pastable-focus'); + }; + })(this)); + }; + + function Paste(_at__container, _at__target) { + this._container = _at__container; + this._target = _at__target; + this._container = $(this._container); + this._target = $(this._target).addClass('pastable'); + this._container.on('paste', (function(_this) { + return function(ev) { + var clipboardData, file, item, reader, text, _i, _j, _len, _len1, _ref, _ref1, _ref2, _ref3, _results; + if (((_ref = ev.originalEvent) != null ? _ref.clipboardData : void 0) != null) { + clipboardData = ev.originalEvent.clipboardData; + if (clipboardData.items) { + _ref1 = clipboardData.items; + for (_i = 0, _len = _ref1.length; _i < _len; _i++) { + item = _ref1[_i]; + if (item.type.match(/^image\//)) { + reader = new FileReader(); + reader.onload = function(event) { + return _this._handleImage(event.target.result); + }; + reader.readAsDataURL(item.getAsFile()); + } + if (item.type === 'text/plain') { + item.getAsString(function(string) { + return _this._target.trigger('pasteText', { + text: string + }); + }); + } + } + } else { + if (-1 !== Array.prototype.indexOf.call(clipboardData.types, 'text/plain')) { + text = clipboardData.getData('Text'); + _this._target.trigger('pasteText', { + text: text + }); + } + _this._checkImagesInContainer(function(src) { + return _this._handleImage(src); + }); + } + } + if (clipboardData = window.clipboardData) { + if ((_ref2 = (text = clipboardData.getData('Text'))) != null ? _ref2.length : void 0) { + return _this._target.trigger('pasteText', { + text: text + }); + } else { + _ref3 = clipboardData.files; + _results = []; + for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) { + file = _ref3[_j]; + _this._handleImage(URL.createObjectURL(file)); + _results.push(_this._checkImagesInContainer(function() {})); + } + return _results; + } + } + }; + })(this)); + } + + Paste.prototype._handleImage = function(src) { + var loader; + loader = new Image(); + loader.onload = (function(_this) { + return function() { + var blob, canvas, ctx, dataURL; + canvas = document.createElement('canvas'); + canvas.width = loader.width; + canvas.height = loader.height; + ctx = canvas.getContext('2d'); + ctx.drawImage(loader, 0, 0, canvas.width, canvas.height); + dataURL = null; + try { + dataURL = canvas.toDataURL('image/png'); + blob = dataURLtoBlob(dataURL); + } catch (_error) {} + if (dataURL) { + return _this._target.trigger('pasteImage', { + blob: blob, + dataURL: dataURL, + width: loader.width, + height: loader.height + }); + } + }; + })(this); + return loader.src = src; + }; + + Paste.prototype._checkImagesInContainer = function(cb) { + var img, timespan, _i, _len, _ref; + timespan = Math.floor(1000 * Math.random()); + _ref = this._container.find('img'); + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + img = _ref[_i]; + img["_paste_marked_" + timespan] = true; + } + return setTimeout((function(_this) { + return function() { + var _j, _len1, _ref1, _results; + _ref1 = _this._container.find('img'); + _results = []; + for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { + img = _ref1[_j]; + if (!img["_paste_marked_" + timespan]) { + cb(img.src); + } + _results.push($(img).remove()); + } + return _results; + }; + })(this), 1); + }; + + return Paste; + + })(); + +}).call(this); + +function enablePasteImg(_editor) { + var editor = _editor, + name = 'paste'; + //òƶ༭Ͳͻ + if(editor.edit == undefined || editor.edit.iframe == undefined){ + return; + } + var contentWindow = editor.edit.iframe[0].contentWindow; + //var contentWindow = editor.iframeDoc; + //var contentWindow = document.getElementsByTagName('iframe')[0].contentWindow; + var nodeBody = contentWindow.document.getElementsByTagName('body')[0]; + console.log(nodeBody); + $(nodeBody).pastableContenteditable(); + + dataURItoBlob = function(dataURI) { + // convert base64/URLEncoded data component to raw binary data held in a string + var byteString; + if (dataURI.split(',')[0].indexOf('base64') >= 0) + byteString = atob(dataURI.split(',')[1]); + else + byteString = unescape(dataURI.split(',')[1]); + + // separate out the mime component + var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0]; + + // write the bytes of the string to a typed array + var ia = new Uint8Array(byteString.length); + for (var i = 0; i < byteString.length; i++) { + ia[i] = byteString.charCodeAt(i); + } + + return new Blob([ia], {type:mimeString}); + }; + + $(nodeBody).on('pasteImage', function(ev, data) { + console.log('pasteImage'); + console.log("dataURL: " + data.dataURL); + console.log("width: " + data.width); + console.log("height: " + data.height); + console.log(data.blob); + var blob = dataURItoBlob(data.dataURL); + if (data.blob !== null) { + var data = new FormData(); + data.append("imgFile",blob, "imageFilename.png"); + console.log(data); + $.ajax({ + url: '/kindeditor/upload?dir=image', + contentType: false, + type: 'POST', + data: data, + processData: false, + success: function(data) { + editor.exec('insertimage', JSON.parse(data).url); + } + }); + } + + }); + return; + contentWindow.document.getElementsByTagName('body')[0].onpaste = function(event) { + // use event.originalEvent.clipboard for newer chrome versions + var items = (event.clipboardData || event.originalEvent.clipboardData).items; + console.log(JSON.stringify(items)); // will give you the mime types + // find pasted image among pasted items + var blob = null; + for (var i = 0; i < items.length; i++) { + if (items[i].type.indexOf("image") === 0) { + blob = items[i].getAsFile(); + } + } + // load image if there is a pasted image + if (blob !== null) { + var reader = new FileReader(); + reader.onload = function(event) { + console.log(event.target.result); // data url! + var data = new FormData(); + data.append("imgFile", blob, "imageFilename.png"); + console.log(blob); + $.ajax({ + url: '/kindeditor/upload?dir=image', + contentType: false, + type: 'POST', + data: data, + processData: false, + success: function(data) { + editor.exec('insertimage', JSON.parse(data).url); + } + }); + }; + reader.readAsDataURL(blob); + } + } +}; From 23a1f84ae70e61fa6b40fc1368272b5a953af3e5 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Wed, 17 Jun 2015 20:59:43 +0800 Subject: [PATCH 3/6] =?UTF-8?q?kindeditor=20js=E9=A1=BA=E5=BA=8F=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_forums.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index fdeb609c8..eae133184 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -12,10 +12,10 @@ <%= csrf_meta_tag %> <%= favicon %> - <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> + <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> From f58b5304843e5ce91e572e2faf7d43bab5dfda95 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Thu, 18 Jun 2015 09:13:20 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=BB=99=E8=AF=BE=E7=A8=8B=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E6=85=A2=E5=8A=A0=E4=B8=8A=E7=BC=93=E5=AD=98=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E5=8A=A0=E5=85=A5=E4=BA=86=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 33 +++++++++++++-------- app/helpers/application_helper.rb | 7 +++++ app/models/activity.rb | 2 ++ app/models/forge_activity.rb | 1 + app/views/courses/show.html.erb | 2 +- app/views/files/_course_list.html.erb | 6 ++-- app/views/files/_project_file_list.html.erb | 6 ++-- config/settings.yml | 3 +- lib/trustie/cache/clear_course_event.rb | 17 +++++++++++ 9 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 lib/trustie/cache/clear_course_event.rb diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 61354add7..524bde9d7 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -695,21 +695,28 @@ class CoursesController < ApplicationController # 显示老师和助教的活动 # @authors = searchTeacherAndAssistant(@course) @authors = course_all_member(@course) + Dir.glob("#{Rails.root}/app/models/*.rb").sort.each { |file| require file } events = [] - @authors.each do |author| - @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course, - :with_subprojects => false, - :author => author.user) - - @activity.scope_select {|t| has["show_#{t}"]} - # modify by nwb - # 添加私密性判断 - if User.current.member_of_course?(@course)|| User.current.admin? - events += @activity.events(@days, @course.created_at) - else - events += @activity.events(@days, @course.created_at, :is_public => 1) + key = "course_events_#{@course.id}".to_sym + if Rails.env.production? && Setting.course_cahce_enabled? + events = Rails.cache.read(key) || [] + end + if events.empty? + @authors.each do |author| + @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course, + :with_subprojects => false, + :author => author.user) + + @activity.scope_select {|t| has["show_#{t}"]} + # modify by nwb + # 添加私密性判断 + if User.current.member_of_course?(@course)|| User.current.admin? + events += @activity.events(@days, @course.created_at) + else + events += @activity.events(@days, @course.created_at, :is_public => 1) + end end - + Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled? end else # @author = @course.teacher diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5ae70fd7c..5af4e2038 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2330,4 +2330,11 @@ module ApplicationHelper def cur_user_works_for_homework homework homework.student_works.where("user_id = ?",User.current).first end + + def file_preview_tag(file, html_options={}) + if %w(pdf pptx doc docx xls xlsx).any?{|x| file.filename.downcase.end_with?(x)} + link_to '预览', download_named_attachment_path(file.id, file.filename, preview: true),html_options + end + end + end diff --git a/app/models/activity.rb b/app/models/activity.rb index e871ae735..5ec778641 100644 --- a/app/models/activity.rb +++ b/app/models/activity.rb @@ -5,4 +5,6 @@ class Activity < ActiveRecord::Base validates :act_id, presence: true validates :act_type, presence: true validates :user_id, presence: true + + include Trustie::Cache::ClearCourseEvent end diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb index e94a29867..6b75552c0 100644 --- a/app/models/forge_activity.rb +++ b/app/models/forge_activity.rb @@ -19,4 +19,5 @@ class ForgeActivity < ActiveRecord::Base validates :project_id,presence: true validates :forge_act_id,presence: true validates :forge_act_type, presence: true + end diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 09d1aa27d..654c25a42 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -126,4 +126,4 @@ }); nh_new_notify_count_show(); }); - \ No newline at end of file + diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index 7f3e426fc..8bb6f8970 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -25,7 +25,9 @@ <% if file.is_public? || User.current.member_of_course?(course) %>
    - <%= link_to truncate(file.filename,length: 35, omission: '...'), download_named_attachment_path(file.id, file.filename, preview: true),:title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %> + <%= link_to truncate(file.filename,length: 35, omission: '...'), + download_named_attachment_path(file.id, file.filename), + :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %> <% if User.current.logged? %> <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %> <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %> @@ -40,7 +42,7 @@ <% else %> <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %> <% end %> - <%= link_to_attachment file, text: '下载', class: 'f_l re_open' %> + <%= file_preview_tag(file, class: 'f_l re_open') %> <% else %> <% end %>
    diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb index 81b69d754..9f9e86cff 100644 --- a/app/views/files/_project_file_list.html.erb +++ b/app/views/files/_project_file_list.html.erb @@ -18,7 +18,9 @@ <% project_attachments.each do |file| %>
    - <%= link_to truncate(file.filename,length: 35, omission: '...'), download_named_attachment_path(file.id, file.filename, preview: true),:title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %> + <%= link_to truncate(file.filename,length: 35, omission: '...'), + download_named_attachment_path(file.id, file.filename), + :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %> <% if User.current.logged? %> <% if (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file) %> <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> @@ -30,7 +32,7 @@ <% else %> <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> <% end %> - <%= link_to_attachment file, text: '下载', class: 'f_l re_open' %> + <%= file_preview_tag(file, class: 'f_l re_open') %> <% end %>
    diff --git a/config/settings.yml b/config/settings.yml index f952e23bf..d0af6d7a1 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -66,7 +66,8 @@ upload_avatar_max_size: ### delayjob for send email. delayjob_enabled: default: 1 - +course_cahce_enabled: + default: 1 bcc_recipients: default: 1 plain_text_mail: diff --git a/lib/trustie/cache/clear_course_event.rb b/lib/trustie/cache/clear_course_event.rb new file mode 100644 index 000000000..98ec8b4fd --- /dev/null +++ b/lib/trustie/cache/clear_course_event.rb @@ -0,0 +1,17 @@ +#coding=utf-8 + +module Trustie + module Cache + module ClearCourseEvent + def self.included(base) + base.class_eval{ + after_create :clear_course_events + } + end + def clear_course_events + Rails.cache.delete("course_events_#{self.act.course_id}".to_sym) if Rails.env.production? && Setting.course_cahce_enabled? + end + end + end +end + From 7a9b5712c06d4a359a00b6f5ef9997da1fa11746 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Thu, 18 Jun 2015 10:54:28 +0800 Subject: [PATCH 5/6] =?UTF-8?q?message=E7=9A=84=E5=8A=A8=E6=80=81=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/trustie/cache/clear_course_event.rb | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/trustie/cache/clear_course_event.rb b/lib/trustie/cache/clear_course_event.rb index 98ec8b4fd..a5f44bf45 100644 --- a/lib/trustie/cache/clear_course_event.rb +++ b/lib/trustie/cache/clear_course_event.rb @@ -8,9 +8,23 @@ module Trustie after_create :clear_course_events } end + def clear_course_events - Rails.cache.delete("course_events_#{self.act.course_id}".to_sym) if Rails.env.production? && Setting.course_cahce_enabled? + if Rails.env.production? && Setting.course_cahce_enabled? + Rails.cache.delete(cache_key) + end + end + + def cache_key + course_id = nil + if Message === self.act + course_id = self.act.board.course_id + elsif self.act.respond_to?(:course_id) + course_id = self.act.course_id + end + "course_events_#{course_id}".to_sym end + end end end From 4aeac1bd649c0f0412453c7498f9de7153e6a5cf Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Thu, 18 Jun 2015 21:39:12 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=AC=A1=E6=95=B0=E4=B8=8D=E7=B4=AF=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 4ecff7a40..09ca29178 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -68,6 +68,7 @@ class AttachmentsController < ApplicationController end def direct_download + @attachment.increment_download send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename), :type => detect_content_type(@attachment), :disposition => 'attachment' #inline can open in browser @@ -78,7 +79,6 @@ class AttachmentsController < ApplicationController # 下载添加权限设置 candown = attachment_candown @attachment if candown || User.current.admin? || User.current.id == @attachment.author_id - @attachment.increment_download if stale?(:etag => @attachment.digest) if params[:preview] == 'true' convered_file = @attachment.diskfile