Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d143a2b

Browse files
ParadeToParadeTo
committed
修改评论-前端部分
1 parent bcffba1 commit d143a2b

File tree

8 files changed

+71
-42
lines changed

8 files changed

+71
-42
lines changed

‎src/http/controller/image.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
type ImageController struct{}
2828

2929
func (self ImageController) RegisterRoute(g *echo.Group) {
30+
// todo 这三个upload差不多啊
3031
g.POST("/image/upload", self.Upload)
3132
g.POST("/image/paste_upload", self.PasteUpload)
3233
g.POST("/image/quick_upload", self.QuickUpload)

‎static/dist/css/sg_styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ a.tab_current:hover {background-color: #445; color: #fff; text-decoration: none;
305305
ul.comment-tab-menu { margin-bottom:2px; }
306306
ul.comment-tab-menu a.op {-moz-border-radius: 8px;-webkit-border-radius: 8px;border-radius: 8px;padding: 0 5px;line-height: 18px;font-size: 12px;margin-right: 6px;text-shadow: 0;color: #444;border: 1px solid #fff;}
307307
ul.comment-tab-menu a.op:hover { text-decoration: none; }
308-
ul.comment-tab-menu .cur a.op:hover { background: #fff;border: 1px solid #ddd;color: #666;}
308+
ul.comment-tab-menu .cur a.op { background: #fff;border: 1px solid #ddd;color: #666;}
309309

310310
.page .page-comment .md-toolbar .upload-img { cursor: pointer;}
311311
.page .page-comment .submit {border-bottom: solid 1px #ECECEC;}

‎static/dist/css/sg_styles.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/dist/js/sg_base.js

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -625,10 +625,18 @@ $(function(){
625625
});
626626
}).call(this);
627627

628-
$(function(){
628+
window.initPLUpload = function (options) {
629+
options = options || {}
630+
options.ele = options.ele || 'upload-img'
631+
options.fileUploaded = options.fileUploaded || function(data) {
632+
var text = $('.main-textarea').val();
633+
text += '!['+file.name+']('+data.data.url+')';
634+
$('.main-textarea').val(text);
635+
}
636+
629637
// 实例化一个plupload上传对象
630638
var uploader = new plupload.Uploader({
631-
browse_button : 'upload-img', // 触发文件选择对话框的按钮，为那个元素id
639+
browse_button : options.ele, // 触发文件选择对话框的按钮，为那个元素id
632640
url : '/image/upload', // 服务器端的上传页面地址
633641
filters: {
634642
mime_types : [ //只允许上传图片
@@ -652,26 +660,24 @@ $(function(){
652660
// 上传进度
653661
});
654662
uploader.bind('FileUploaded', function(uploader, file, responseObject) {
655-
window.uploadSuccess(uploader, file, responseObject)
656-
});
657-
uploader.bind('Error',function(uploader,errObject){
658-
comTip("上传出错了："+errObject.message);
659-
});
660-
661-
window.uploadSuccess = function(uploader,file,responseObject){
662663
if (responseObject.status == 200) {
663664
var data = $.parseJSON(responseObject.response);
664665
if (data.ok) {
665-
var text = $('.main-textarea').val();
666-
text += '!['+file.name+']('+data.data.url+')';
667-
$('.main-textarea').val(text);
666+
options.fileUploaded(data)
668667
} else {
669668
comTip("上传失败："+data.error);
670669
}
671670
} else {
672671
comTip("上传失败：HTTP状态码："+responseObject.status);
673672
}
674-
}
673+
});
674+
uploader.bind('Error',function(uploader,errObject){
675+
comTip("上传出错了："+errObject.message);
676+
});
677+
}
678+
679+
$(function(){
680+
initPLUpload()
675681
});
676682
jQuery(document).ready(function(){
677683

@@ -802,6 +808,14 @@ jQuery(document).ready(function(){
802808
evt.preventDefault();
803809
var floor = $(this).data('floor');
804810
toggleCommentShowOrEdit(floor, false)
811+
812+
var $uploadBtn = $('.upload-img[data-floor="' + floor + '"]')
813+
window.initPLUpload({
814+
ele: $uploadBtn[0],
815+
fileUploaded: function () {
816+
console.log(1214)
817+
}
818+
})
805819
});
806820

807821
// 点击取消编辑评论按钮
@@ -816,14 +830,16 @@ jQuery(document).ready(function(){
816830
evt.stopPropagation();
817831
var floor = $(this).data('floor');
818832
var $markdown = $('.markdown[data-floor="' + floor + '"]')
819-
var $submitBtn = $(this);
833+
var $submitBtn = $(this)
820834
var $editWrapper = $markdown.children('.edit-wrapper')
821-
var $textarea = $editWrapper.children('textarea')
822-
var content = $textarea.val()
835+
var $textarea = $editWrapper.find('textarea')
836+
var $content = $markdown.children('.content')
837+
var content = $textarea.val()
823838
var cid = $submitBtn.data("cid")
824839

825840
editComment($submitBtn, cid, content, function() {
826841
$textarea.data('raw-content', content)
842+
$content.html(content)
827843
toggleCommentShowOrEdit(floor, true)
828844
})
829845
})
@@ -983,10 +999,8 @@ jQuery(document).ready(function(){
983999
setTimeout(function() {
9841000
comTip("修改成功！");
9851001
callback()
1002+
thiss.text("提交").removeClass("disabled").removeAttr("disabled").attr({"title":'提交'});
9861003
}, 1500)
987-
988-
989-
thiss.text("提交").removeClass("disabled").removeAttr("disabled").attr({"title":'提交'});
9901004
}
9911005

9921006
var postComment = function(thiss, content, callback){

‎static/dist/js/sg_base.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/js/base/comment.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,14 @@
9999
evt.preventDefault();
100100
var floor = $(this).data('floor');
101101
toggleCommentShowOrEdit(floor, false)
102+
103+
var $uploadBtn = $('.upload-img[data-floor="' + floor + '"]')
104+
window.initPLUpload({
105+
ele: $uploadBtn[0],
106+
fileUploaded: function () {
107+
console.log(1214)
108+
}
109+
})
102110
});
103111

104112
// 点击取消编辑评论按钮
@@ -113,14 +121,16 @@
113121
evt.stopPropagation();
114122
var floor = $(this).data('floor');
115123
var $markdown = $('.markdown[data-floor="' + floor + '"]')
116-
var $submitBtn = $(this);
124+
var $submitBtn = $(this)
117125
var $editWrapper = $markdown.children('.edit-wrapper')
118-
var $textarea = $editWrapper.children('textarea')
119-
var content = $textarea.val()
126+
var $textarea = $editWrapper.find('textarea')
127+
var $content = $markdown.children('.content')
128+
var content = $textarea.val()
120129
var cid = $submitBtn.data("cid")
121130

122131
editComment($submitBtn, cid, content, function() {
123132
$textarea.data('raw-content', content)
133+
$content.html(content)
124134
toggleCommentShowOrEdit(floor, true)
125135
})
126136
})
@@ -280,10 +290,8 @@
280290
setTimeout(function() {
281291
comTip("修改成功！");
282292
callback()
293+
thiss.text("提交").removeClass("disabled").removeAttr("disabled").attr({"title":'提交'});
283294
}, 1500)
284-
285-
286-
thiss.text("提交").removeClass("disabled").removeAttr("disabled").attr({"title":'提交'});
287295
}
288296

289297
var postComment = function(thiss, content, callback){

‎static/js/base/puploader.js

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
$(function(){
1+
window.initPLUpload = function (options) {
2+
options = options || {}
3+
options.ele = options.ele || 'upload-img'
4+
options.fileUploaded = options.fileUploaded || function(data) {
5+
var text = $('.main-textarea').val();
6+
text += '!['+file.name+']('+data.data.url+')';
7+
$('.main-textarea').val(text);
8+
}
9+
210
// 实例化一个plupload上传对象
311
var uploader = new plupload.Uploader({
4-
browse_button : 'upload-img', // 触发文件选择对话框的按钮，为那个元素id
12+
browse_button : options.ele, // 触发文件选择对话框的按钮，为那个元素id
513
url : '/image/upload', // 服务器端的上传页面地址
614
filters: {
715
mime_types : [ //只允许上传图片
@@ -25,24 +33,22 @@ $(function(){
2533
// 上传进度
2634
});
2735
uploader.bind('FileUploaded', function(uploader, file, responseObject) {
28-
window.uploadSuccess(uploader, file, responseObject)
29-
});
30-
uploader.bind('Error',function(uploader,errObject){
31-
comTip("上传出错了："+errObject.message);
32-
});
33-
34-
window.uploadSuccess = function(uploader,file,responseObject){
3536
if (responseObject.status == 200) {
3637
var data = $.parseJSON(responseObject.response);
3738
if (data.ok) {
38-
var text = $('.main-textarea').val();
39-
text += '!['+file.name+']('+data.data.url+')';
40-
$('.main-textarea').val(text);
39+
options.fileUploaded(data)
4140
} else {
4241
comTip("上传失败："+data.error);
4342
}
4443
} else {
4544
comTip("上传失败：HTTP状态码："+responseObject.status);
4645
}
47-
}
46+
});
47+
uploader.bind('Error',function(uploader,errObject){
48+
comTip("上传出错了："+errObject.message);
49+
});
50+
}
51+
52+
$(function(){
53+
initPLUpload()
4854
});

‎template/common/comment.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@
253253
<li class="comment-preview-tab"><a href="#" class="op">预览</a></li>
254254
</ul>
255255
<div class="col-md-2 text-right">
256-
<i id="upload-img" class="glyphicon glyphicon-picture upload-img tool-tip" data-toggle="tooltip" data-placement="top" title="上传图片"></i>
256+
<i data-floor="[%:comment.floor%]" class="glyphicon glyphicon-picture upload-img tool-tip" data-toggle="tooltip" data-placement="top" title="上传图片"></i>
257257
</div>
258258
</div>
259259
<div class="comment-content-text" data-comment-group="[%:comment.floor%]">

0 commit comments

Comments
 (0)