From e502aa7c439558fcd7f96d5b23c95213e0aeb67d Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Tue, 10 May 2016 12:51:42 +0800 Subject: [PATCH 1/7] =?UTF-8?q?KE=E8=A1=A8=E6=A0=BC=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E8=87=AA=E5=8A=A8=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=81=9A=E4=BA=86=E4=B8=80=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 12 ++-- app/views/users/_user_course_list.html.erb | 2 +- app/views/users/_user_project_list.html.erb | 2 +- .../kindeditor/assets_controller.rb | 12 ++++ lib/rails_kindeditor/config/routes.rb | 1 + public/assets/kindeditor/kindeditor.js | 16 ++--- public/assets/kindeditor/pasteimg.js | 66 +++++++++++++++++++ .../kindeditor/plugins/code/previewcode.css | 10 ++- .../assets/kindeditor/plugins/paste/paste.js | 1 + .../assets/kindeditor/plugins/table/table.js | 2 +- public/stylesheets/courses.css | 6 ++ public/stylesheets/new_user.css | 11 +++- public/stylesheets/project.css | 4 ++ public/stylesheets/public.css | 6 +- 14 files changed, 127 insertions(+), 24 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 54970add6..ce54496a0 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2855,11 +2855,11 @@ class UsersController < ApplicationController @c_sort = 2 end - sort_name = "updated_at" + sort_name = "updated_on" sort_type = @c_sort == 1 ? "asc" : "desc" - @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}") - # @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a #{sort_type}") + # @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}") + @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}") #根据 作业+资源数排序 if @order.to_i == 2 @@ -2900,11 +2900,11 @@ class UsersController < ApplicationController @c_sort = 2 end - sort_name = "updated_on" + sort_name = "updated_at" sort_type = @c_sort == 1 ? "asc" : "desc" - @projects = @user.projects.visible.order("#{sort_name} #{sort_type}") - # @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a #{sort_type}") + #@projects = @user.projects.visible.order("#{sort_name} #{sort_type}") + @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS #{sort_name} ").order("#{sort_name} #{sort_type}") #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num if @order.to_i == 2 diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb index 212798eb1..8ef0faa9e 100644 --- a/app/views/users/_user_course_list.html.erb +++ b/app/views/users/_user_course_list.html.erb @@ -31,7 +31,7 @@ 创建时间：<%= format_time(course.created_at) %> - 更新时间：<%= format_time(course.updated_at) %> + 更新时间：<%= format_time(course.updated_on) %> 开课学期:  <%= current_time_and_term course %> diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb index b7b4948e4..1526da58f 100644 --- a/app/views/users/_user_project_list.html.erb +++ b/app/views/users/_user_project_list.html.erb @@ -28,7 +28,7 @@
  • 创建时间：<%= format_time(project.created_on) %> - 更新时间：<%= format_time(project.updated_on) %> + 更新时间：<%= format_time(project.updated_at) %>

    <%= project.project_score.issue_num %>问题| <%= project.project_score.attach_num %>资源

    • diff --git a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb index 0e1177563..c94a3944e 100644 --- a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb +++ b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb @@ -118,6 +118,18 @@ class Kindeditor::AssetsController < ApplicationController @result[:file_list] = @file_list render :text => @result.to_json end + + def uploadpic + picstr = params["pic"]; + + picArry = picstr.split("|") + + picArry.each do |picurl| + puts picurl + end + + + end private def show_error(msg) diff --git a/lib/rails_kindeditor/config/routes.rb b/lib/rails_kindeditor/config/routes.rb index 7ebb0b748..86b888ad3 100644 --- a/lib/rails_kindeditor/config/routes.rb +++ b/lib/rails_kindeditor/config/routes.rb @@ -2,5 +2,6 @@ Rails.application.routes.draw do namespace :kindeditor do post "/upload" => "assets#create" get "/filemanager" => "assets#list" + get "/uploadpic" => "assets#uploadpic" end end \ No newline at end of file diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 74013be54..579da5d0c 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -3,8 +3,7 @@ // for (var property in myObject) { // s = s + "\n "+property +": " + myObject[property] ; // } -// alert(s); -//} +// alert(s) /******************************************************************************* * KindEditor - WYSIWYG HTML Editor for Internet * Copyright (C) 2006-2013 kindsoft.net @@ -3788,17 +3787,17 @@ _extend(KEdit, KWidget, { } else { val = body.innerHTML; } - if (self.beforeGetHtml) { - val = self.beforeGetHtml(val); - } +// if (self.beforeGetHtml) { +// val = self.beforeGetHtml(val); +// } if (_GECKO && val == '
    ') { val = ''; } return val; } - if (self.beforeSetHtml) { - val = self.beforeSetHtml(val); - } +// if (self.beforeSetHtml) { +// val = self.beforeSetHtml(val); +// } if (_IE && _V >= 9) { val = val.replace(/(<.*?checked=")checked(".*>)/ig, '$1$2'); } @@ -4690,6 +4689,7 @@ function _bindNewlineEvent() { }); K(doc).keyup(function(e) { if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) { + df(); return; } if (newlineTag == 'br') { diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index f08a768aa..5f62eac17 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -352,3 +352,69 @@ function enablePasteImg(_editor) { }); return; }; + +function df() { + var haspicContainer = document.getElementById("has_pic"); + if (haspicContainer == null) { + haspicContainer = document.createElement("div"); + haspicContainer.id = "has_pic"; + haspicContainer.innerHTML = "
    您有图片需要上传到服务器  上传
    "; + $(".ke-toolbar").after(haspicContainer); + } + + var img = $(".ke-edit-iframe").contents().find("img"); + + var piccount = 0; + var sstr = ""; + $(img).each(function (i) { + var that = $(this); + if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) { + piccount++; + if (i == $(img).length - 1) + sstr += that.attr("src"); + else + sstr += that.attr("src") + "|"; + } + }); + + $("#piclist").val(sstr); + document.getElementById("has_pic").style.display = (piccount > 0) ? "block" : "none"; +} + +function closeupload() { + $("#has_pic").hide(); + $("#upload").show(); +} + +function uploadpic() { + var piclist = encodeURI($("#piclist").val()); + if (piclist.length == 0) return false; + $.ajax({ + url: "/kindeditor/uploadpic", + data: "pic=" + piclist, + type: "GET", + beforeSend: function () { + $("#upload").hide(); + $("#confirm").text("正在上传中..."); + }, + success: function (msg) { + if (msg !== "") { + var str = new Array(); + str = msg.split('|'); + var img = $(".ke-edit-iframe").contents().find("img"); + + $(img).each(function (i) { + var that = $(this); + if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) { + that.attr("src", "/uploads/image/" + str[i]); + that.attr("data-ke-src", "/uploads/image/" + str[i]); + } + }); + + $("#confirm").html(img.length + "张图片已经上传成功！  关闭"); + } + else $("#confirm").text("上传失败！"); + } + }); +} + diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css index c2adf3a35..b9c8252e8 100644 --- a/public/assets/kindeditor/plugins/code/previewcode.css +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -1,7 +1,7 @@ .ke-content { font-size: 12px; - font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢ź, ; - font-family:Tahoma; + font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢���ź�, ����; + font-family:Tahoma; } .ke-content pre { font-size:9pt; @@ -48,4 +48,8 @@ .ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;} span.at {color:#269ac9;} -span.at a{color:#269ac9;text-decoration: none;} \ No newline at end of file +span.at a{color:#269ac9;text-decoration: none;} + +/*yk*/ +.ke-content ol li{list-style-type: decimal;margin-left: 20px;} +.ke-content ul li{list-style-type: disc;margin-left: 20px;} \ No newline at end of file diff --git a/public/assets/kindeditor/plugins/paste/paste.js b/public/assets/kindeditor/plugins/paste/paste.js index 767cefb09..abf777398 100644 --- a/public/assets/kindeditor/plugins/paste/paste.js +++ b/public/assets/kindeditor/plugins/paste/paste.js @@ -353,3 +353,4 @@ KindEditor.plugin('paste', function(K) { return; }); + diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js index 9eb29fb30..be386f7cc 100644 --- a/public/assets/kindeditor/plugins/table/table.js +++ b/public/assets/kindeditor/plugins/table/table.js @@ -283,7 +283,7 @@ KindEditor.plugin('table', function(K) { for (var i = 0; i < rows; i++) { html += ''; for (var j = 0; j < cols; j++) { - html += '' + (K.IE ? ' ' : '
    ') + ''; + html += '' + (K.IE ? ' ' : '
    ') + ''; } html += ''; } diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index f83a180d3..6e55146a6 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -124,12 +124,14 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostDes {float:left; width:655px; margin-left:15px;} .homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;} .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;} +.homepagePostTitle td,.homepagePostTitle tr {border: 1px solid; border-color: inherit;} .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;} .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;} .homepagePostSubmit:hover {background-color:#d8d8d8;} .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;} .homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;} .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;} .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;} @@ -172,6 +174,7 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .table_maxWidth table {max-width: 642px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;} @@ -1111,6 +1114,9 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;} .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;} .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;} +.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;} +.postDetailDes ul li{list-style-type: disc;margin-left: 20px;} +.postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;} .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;} .postDetailDate {color:#888888; font-size:12px; float:left;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 8e62f6d3f..67176c761 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -7,7 +7,8 @@ div,img,tr,td,table{ border:0;} table,tr,td{border:0;cellspacing:0; cellpadding:0;} ol,ul,li{ list-style-type:none} a:link,a:visited{color:#7f7f7f;text-decoration:none;} -a:hover,a:active{color:#000;} +a:hover,a:active{color:#000;}tr,td,table{ border:0;} +table,tr,td{border:0;cellspacing:0; cellpadding:0;} .pInline {margin:0px; padding:0px; display:inline-block;} /*常用*/ @@ -667,6 +668,7 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostDes {float:left; width:655px; margin-left:15px; overflow:hidden;} .homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;} .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;} +.homepagePostTitle td,.homepagePostTitle tr {border: 1px solid; border-color: inherit;} .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;} .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;} .homepagePostSubmit:hover {background-color:#d8d8d8;} @@ -676,6 +678,7 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;} .homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;} .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;} .borderBottomNone {border-bottom:none !important;} .topBorder {border-top: 1px solid #e4e4e4;} @@ -712,6 +715,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family:"微软雅黑","宋体";} .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .table_maxWidth table {max-width: 642px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;} @@ -853,6 +857,9 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re .postDetailTitle {width:570px; max-width:570px; margin-bottom:5px;} .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;} .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;} +.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;} +.postDetailDes ul li{list-style-type: disc;margin-left: 20px;} +.postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;} .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;} .postDetailDate {color:#888888; font-size:12px; float:left;} @@ -1551,4 +1558,4 @@ ul.wlist li{float: left;} ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3px;} ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;} /*.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}*/ -.wlist_select a{background-color: #64bdd9;cursor: default;} +.wlist_select a{background-color: #64bdd9;cursor: default;} \ No newline at end of file diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 79f06769e..1ef99e66b 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -973,6 +973,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;} } .homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;} .topBorder { border-top: 1px solid #E4E4E4; } @@ -1110,6 +1111,9 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;} .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;} .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;} .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;} +.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;} +.postDetailDes ul li{list-style-type: disc;margin-left: 20px;} +.postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;} .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;} .postDetailDate {color:#888888; font-size:12px; float:left;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index d016fee4a..253aaf46b 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -601,6 +601,7 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;} .homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;} .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;} .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;} .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;} @@ -636,6 +637,7 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .table_maxWidth table {max-width: 642px;} .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;} @@ -972,8 +974,8 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r .AgreementTxt{text-indent:2em; margin-bottom:15px;} .AgreementImg{ margin:0px auto;} -.list_style ol li{list-style-type: decimal;margin-left: 20px;} -.list_style ul li{list-style-type: disc;margin-left: 20px;} +.list_style ol li{list-style-type:decimal; margin-left:20px;} +.list_style ul li{list-style-type:disc; margin-left:20px;} /* @功能 定义 */ span.at {color:#269ac9;} From 135e02504ec4d154ecac2214aae203c095a04e32 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Wed, 11 May 2016 11:40:01 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 4 ++- lib/grack/Gemfile.lock | 2 +- .../kindeditor/assets_controller.rb | 33 ++++++++++++++--- public/assets/kindeditor/kindeditor.js | 4 ++- public/assets/kindeditor/pasteimg.js | 36 ++++++------------- 5 files changed, 46 insertions(+), 33 deletions(-) diff --git a/Gemfile b/Gemfile index 2b12860f0..97d0e5a4f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'https://ruby.taobao.org' +source 'https://rubygems.org/' #source 'http://ruby.sdutlinux.org/' unless RUBY_PLATFORM =~ /w32/ @@ -40,6 +40,8 @@ gem 'kaminari' gem 'elasticsearch-model' gem 'elasticsearch-rails' +gem 'certified' + group :development do gem 'grape-swagger' gem 'better_errors', '~> 1.1.0' diff --git a/lib/grack/Gemfile.lock b/lib/grack/Gemfile.lock index 68fa71a2b..8ae4dcc6c 100644 --- a/lib/grack/Gemfile.lock +++ b/lib/grack/Gemfile.lock @@ -5,7 +5,7 @@ PATH rack (~> 1.5.1) GEM - remote: https://ruby.taobao.org/ + remote: https://rubygems.org/ specs: byebug (4.0.5) columnize (= 0.9.0) diff --git a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb index c94a3944e..30b532acb 100644 --- a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb +++ b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb @@ -119,16 +119,41 @@ class Kindeditor::AssetsController < ApplicationController render :text => @result.to_json end + #在KE里面复制粘贴的时候 把图片下载到服务器上 def uploadpic - picstr = params["pic"]; + picStr = params["pic"] + picArry = picStr.split("|") - picArry = picstr.split("|") + #图片存放目录 + dirPath = "public/files/uploads/image/" + dirDate = Time.now.strftime('%Y%m') - picArry.each do |picurl| - puts picurl + unless Dir.exist?(dirPath+dirDate) + Dir.mkdir(dirPath+dirDate) end + fileStr = [] + picArry.each_with_index do |picUrl,index| + imgBaseName = File.basename(picUrl) + tmpImgType = imgBaseName.split(".").last[0..2] + # 仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF + + fileType = tmpImgType.match("gif|jpg|jpeg|png|bmp|BMP|JPEG|JPG|PNG|GIF") + + fileName = fileType.nil? ? Time.now.to_i.to_s+index.to_s : Time.now.to_i.to_s+index.to_s+"."+fileType[0] + + # fileType = File.basename(picurl).split(".").last[0..2] + # fileName = Time.now.to_i.to_s+index.to_s + fileDir = dirPath + dirDate + "/"+fileName + + #重点!! + File.open(fileDir,'wb'){ |f| f.write(open(picUrl).read) } + fileDir = fileDir.split("public")[1] + fileStr = filedir + "|" + + end + render :text =>fileStr end private diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 579da5d0c..cb66f91ee 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -4689,7 +4689,6 @@ function _bindNewlineEvent() { }); K(doc).keyup(function(e) { if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) { - df(); return; } if (newlineTag == 'br') { @@ -5995,6 +5994,9 @@ _plugin('core', function(K) { } } self.insertHtml(html, true); + df(); + +// $("#ajax-indicator").hide(); } K(doc.body).bind('paste', function(e){ if (self.pasteType === 0) { diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index 5f62eac17..a9505f8d6 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -354,16 +354,7 @@ function enablePasteImg(_editor) { }; function df() { - var haspicContainer = document.getElementById("has_pic"); - if (haspicContainer == null) { - haspicContainer = document.createElement("div"); - haspicContainer.id = "has_pic"; - haspicContainer.innerHTML = "
    您有图片需要上传到服务器  上传
    "; - $(".ke-toolbar").after(haspicContainer); - } - var img = $(".ke-edit-iframe").contents().find("img"); - var piccount = 0; var sstr = ""; $(img).each(function (i) { @@ -376,26 +367,17 @@ function df() { sstr += that.attr("src") + "|"; } }); - - $("#piclist").val(sstr); - document.getElementById("has_pic").style.display = (piccount > 0) ? "block" : "none"; + uploadpic(sstr); } -function closeupload() { - $("#has_pic").hide(); - $("#upload").show(); -} - -function uploadpic() { - var piclist = encodeURI($("#piclist").val()); +function uploadpic(piclist) { if (piclist.length == 0) return false; $.ajax({ url: "/kindeditor/uploadpic", data: "pic=" + piclist, type: "GET", beforeSend: function () { - $("#upload").hide(); - $("#confirm").text("正在上传中..."); + $("#ajax-indicator").text("图片上传中请稍等..."); }, success: function (msg) { if (msg !== "") { @@ -403,17 +385,19 @@ function uploadpic() { str = msg.split('|'); var img = $(".ke-edit-iframe").contents().find("img"); + var tIndex = 0; $(img).each(function (i) { var that = $(this); if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) { - that.attr("src", "/uploads/image/" + str[i]); - that.attr("data-ke-src", "/uploads/image/" + str[i]); + that.attr("src", str[tIndex]); + that.attr("data-ke-src", str[tIndex]); + that.parent().attr("href", str[tIndex]); + that.parent().attr("data-ke-src", str[tIndex]); + tIndex = tIndex + 1; } }); - - $("#confirm").html(img.length + "张图片已经上传成功！  关闭"); } - else $("#confirm").text("上传失败！"); +// else $("#confirm").text("上传失败！"); } }); } From 5180fdab395dbafcb96a28bfca9e0b5d354d31b2 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Wed, 11 May 2016 14:04:31 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controllers/kindeditor/assets_controller.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb index 30b532acb..fd6345f46 100644 --- a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb +++ b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb @@ -128,6 +128,19 @@ class Kindeditor::AssetsController < ApplicationController dirPath = "public/files/uploads/image/" dirDate = Time.now.strftime('%Y%m') + unless Dir.exist?("public") + Dir.mkdir("public") + end + unless Dir.exist?("public/files") + Dir.mkdir("public/files") + end + unless Dir.exist?("public/files/uploads") + Dir.mkdir("public/files/uploads") + end + unless Dir.exist?("public/files/uploads/image") + Dir.mkdir("public/files/uploads/image") + end + unless Dir.exist?(dirPath+dirDate) Dir.mkdir(dirPath+dirDate) end From a39702f962265dd7d2e082d7807e9c92ebbd1d9e Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 13 May 2016 08:38:28 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=EF=BC=8C=E4=BB=A3=E7=A0=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF=E8=BF=87=E9=95=BF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 - app/controllers/student_work_controller.rb | 1 + .../kindeditor/assets_controller.rb | 15 +-- public/assets/kindeditor/kindeditor.js | 20 +++- public/assets/kindeditor/pasteimg.js | 98 ++++++++++++------- 5 files changed, 90 insertions(+), 46 deletions(-) diff --git a/Gemfile b/Gemfile index 97d0e5a4f..2c8df6853 100644 --- a/Gemfile +++ b/Gemfile @@ -40,8 +40,6 @@ gem 'kaminari' gem 'elasticsearch-model' gem 'elasticsearch-rails' -gem 'certified' - group :development do gem 'grape-swagger' gem 'better_errors', '~> 1.1.0' diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index c2b113803..a085e4ce3 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -123,6 +123,7 @@ class StudentWorkController < ApplicationController #-1 默认值 0全部正确并结束 2 超时 -2 编译错误 resultObj[:status] = -1 resultObj[:results] = result["results"].first #本次测试结果 + result["error_msg"] = result["error_msg"][0..1023] resultObj[:error_msg] = result["error_msg"] #编译错误时的信息 #该状态用于存入CodeTests diff --git a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb index fd6345f46..e47bdc048 100644 --- a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb +++ b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb @@ -145,11 +145,11 @@ class Kindeditor::AssetsController < ApplicationController Dir.mkdir(dirPath+dirDate) end - fileStr = [] + fileStr = "" picArry.each_with_index do |picUrl,index| imgBaseName = File.basename(picUrl) - tmpImgType = imgBaseName.split(".").last[0..2] + tmpImgType = imgBaseName.split(".").last.split("?")[0] # 仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF fileType = tmpImgType.match("gif|jpg|jpeg|png|bmp|BMP|JPEG|JPG|PNG|GIF") @@ -161,10 +161,13 @@ class Kindeditor::AssetsController < ApplicationController fileDir = dirPath + dirDate + "/"+fileName #重点!! - File.open(fileDir,'wb'){ |f| f.write(open(picUrl).read) } - fileDir = fileDir.split("public")[1] - fileStr = filedir + "|" - + begin + File.open(fileDir,'wb'){ |f| f.write(open(picUrl).read) } + fileDir = fileDir.split("public")[1] + rescue + fileDir = picUrl + end + fileStr = fileStr+fileDir + "|" end render :text =>fileStr end diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index cb66f91ee..755f1427a 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -5993,10 +5993,24 @@ _plugin('core', function(K) { html = html.replace(/\n/g, '
    $&'); } } - self.insertHtml(html, true); - df(); -// $("#ajax-indicator").hide(); +// var kePasteContainer = document.getElementById("ke_paste"); +// if (kePasteContainer == null) { +// kePasteContainer = document.createElement("div"); +// kePasteContainer.id = "ke_paste"; +// var last=document.body.lastChild;//得到页面的最后个元素 +// document.body.insertBefore(kePasteContainer,last);//在得到的最后元素之前插入 +// } +// kePasteContainer.innerHTML = html; +// $("#ke_paste").hide(); +// +// var imglist = $("#ke_paste").find("img"); +// +// if (imglist.length > 0){ +// df(self); +// } + self.insertHtml(html, true); + df(self); } K(doc.body).bind('paste', function(e){ if (self.pasteType === 0) { diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index a9505f8d6..41474d013 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -1,8 +1,8 @@ // 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 + 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() { @@ -279,7 +279,7 @@ https://github.com/layerssss/paste.js } //firefox问题处理，因为采用了 pastableContenteditable 模式，故只需要删除默认的粘贴 if ($(img).attr('src').startsWith('data:image/')) { - _results.push($(img).remove()); + _results.push($(img).remove()); }; } return _results; @@ -307,23 +307,23 @@ function enablePasteImg(_editor) { $(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]); + // 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]; + // 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); - } + // 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}); + return new Blob([ia], {type:mimeString}); }; $(nodeBody).on('pasteImage', function(ev, data) { @@ -337,15 +337,15 @@ function enablePasteImg(_editor) { 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) { - console.log(data); - editor.exec('insertimage', JSON.parse(data).url); - } + url: '/kindeditor/upload?dir=image', + contentType: false, + type: 'POST', + data: data, + processData: false, + success: function(data) { + console.log(data); + editor.exec('insertimage', JSON.parse(data).url); + } }); } @@ -353,8 +353,11 @@ function enablePasteImg(_editor) { return; }; -function df() { - var img = $(".ke-edit-iframe").contents().find("img"); +//复制粘贴时把远程图片上传到服务器 +function df(myself) { +// var img = $("#ke_paste").find("img"); + var currele = document.activeElement; + var img = $(currele).contents().find("img"); var piccount = 0; var sstr = ""; $(img).each(function (i) { @@ -367,24 +370,42 @@ function df() { sstr += that.attr("src") + "|"; } }); - uploadpic(sstr); + uploadpic(sstr,myself); } -function uploadpic(piclist) { +function keShadow(myself) +{ + var keShadowContainer = document.getElementById("ke_shadow"); + if (keShadowContainer == null) { + keShadowContainer = document.createElement("div"); + keShadowContainer.id = "ke_shadow"; + keShadowContainer.innerHTML = "
    "; + $("#ajax-modal").after(keShadowContainer); + } + var tWidth = document.body.scrollWidth; + var tHeight = document.body.scrollHeight; + $(".ui-widget-overlay").css("width", tWidth); + $(".ui-widget-overlay").css("height", tHeight); + $("#ke_shadow").show(); + myself.readonly(); +} + +function uploadpic(piclist,myself) { if (piclist.length == 0) return false; $.ajax({ url: "/kindeditor/uploadpic", - data: "pic=" + piclist, + data:{"pic":piclist}, type: "GET", beforeSend: function () { - $("#ajax-indicator").text("图片上传中请稍等..."); +// $("#ajax-indicator span").text("图片上传中请稍等..."); + keShadow(myself); }, success: function (msg) { if (msg !== "") { var str = new Array(); str = msg.split('|'); - var img = $(".ke-edit-iframe").contents().find("img"); - + var currele = document.activeElement; + var img = $(currele).contents().find("img"); var tIndex = 0; $(img).each(function (i) { var that = $(this); @@ -397,8 +418,15 @@ function uploadpic(piclist) { } }); } -// else $("#confirm").text("上传失败！"); + // $("#ajax-indicator span").text("载入中..."); + $("#ke_shadow").hide(); + myself.readonly(false); } + }).fail(function(xhr, status){ +// $("#ajax-indicator span").text("载入中..."); + $("#ke_shadow").hide(); + myself.readonly(false); + return; }); } From 6237bcb6cd78a7631ab00295761edb30ec6e2087 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 13 May 2016 09:10:08 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8A=A0=E4=B8=AAgem=20'certified'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 1 + app/controllers/student_work_controller.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2c8df6853..fbfd4c100 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ unless RUBY_PLATFORM =~ /w32/ gem 'iconv' end +gem 'certified' gem 'grack', path:'lib/grack' gem 'gitlab', path: 'lib/gitlab-cli' gem 'rest-client' diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index a085e4ce3..ba2999577 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -123,7 +123,7 @@ class StudentWorkController < ApplicationController #-1 默认值 0全部正确并结束 2 超时 -2 编译错误 resultObj[:status] = -1 resultObj[:results] = result["results"].first #本次测试结果 - result["error_msg"] = result["error_msg"][0..1023] + result["error_msg"] = result["error_msg"][0..2047] resultObj[:error_msg] = result["error_msg"] #编译错误时的信息 #该状态用于存入CodeTests From c31d4dc3bdc0a81e99016ee6ca81a5f08dc1cfbd Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 13 May 2016 09:19:47 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=88=91=E8=A6=81=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E5=AD=97=E4=B8=8D=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/create_kindeditor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js index 8989f8716..2ff5336e1 100644 --- a/public/javascripts/create_kindeditor.js +++ b/public/javascripts/create_kindeditor.js @@ -31,7 +31,7 @@ function sd_create_editor(params){ //params.toolbar_container.hide(); sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea}); if(this.isEmpty()) { - this.edit.html("我要回复"); + this.edit.html("我要回复"); } //params.toolbar_container.hide(); $('#reply_image_' + id).addClass('imageFuzzy'); @@ -78,7 +78,7 @@ function sd_create_editor(params){ //reset height paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight; edit.iframe.height(paramsHeight); - edit.html("我要回复"); + edit.html("我要回复"); this.resize(null,paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight) // params.toolbar_container.hide(); if(typeof enableAt === 'function'){ From a1323e3d76bf364c93a75a4f2470fe63c93920c0 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 13 May 2016 11:32:52 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/kindeditor.js | 13 ++++++----- public/assets/kindeditor/pasteimg.js | 32 ++++++++++++++++---------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 755f1427a..f96216658 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -3787,17 +3787,18 @@ _extend(KEdit, KWidget, { } else { val = body.innerHTML; } -// if (self.beforeGetHtml) { -// val = self.beforeGetHtml(val); -// } + //yk + if (self.beforeGetHtml) { + val = self.beforeGetHtml(val); + } if (_GECKO && val == '
    ') { val = ''; } return val; } -// if (self.beforeSetHtml) { -// val = self.beforeSetHtml(val); -// } + if (self.beforeSetHtml) { + val = self.beforeSetHtml(val); + } if (_IE && _V >= 9) { val = val.replace(/(<.*?checked=")checked(".*>)/ig, '$1$2'); } diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index 41474d013..385e02ac2 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -362,12 +362,14 @@ function df(myself) { var sstr = ""; $(img).each(function (i) { var that = $(this); - if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) { - piccount++; - if (i == $(img).length - 1) - sstr += that.attr("src"); - else - sstr += that.attr("src") + "|"; + if(that.attr("src")) { + if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) { + piccount++; + if (i == $(img).length - 1) + sstr += that.attr("src"); + else + sstr += that.attr("src") + "|"; + } } }); uploadpic(sstr,myself); @@ -409,12 +411,18 @@ function uploadpic(piclist,myself) { var tIndex = 0; $(img).each(function (i) { var that = $(this); - if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) { - that.attr("src", str[tIndex]); - that.attr("data-ke-src", str[tIndex]); - that.parent().attr("href", str[tIndex]); - that.parent().attr("data-ke-src", str[tIndex]); - tIndex = tIndex + 1; + if(that.attr("src")){ + if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) { + that.attr("src", str[tIndex]); + that.attr("data-ke-src", str[tIndex]); + + //非视频 + if(!(that.parent().attr("class") && that.parent().attr("class") == "mediaIcobox" )) { + that.parent().attr("href", str[tIndex]); + that.parent().attr("data-ke-src", str[tIndex]); + } + tIndex = tIndex + 1; + } } }); }