iFish/Light12306
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正部分情况下图标无法发送表情的bug；延迟贴图发送信息；微调跨站推荐样式

Browse Source
This commit is contained in:
木鱼(iFish) 2015-08-12 15:16:54 +08:00
parent 1da7e678d5
commit 6bc60739f7
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Web12306/css/ui/query-result.css
View File

@ -282,6 +282,8 @@
#suggestion .result .train-list { #suggestion .result .train-list {
border: 1px solid #dcdcdc; border: 1px solid #dcdcdc;
padding: 10px; padding: 10px;
max-width: 500px;
word-wrap: break-word;
} }
#suggestion .result .train-list span { #suggestion .result .train-list span {

8
Web12306/js/ui/chat/roomsession.js
View File

@ -168,8 +168,10 @@
.done(function (json) { .done(function (json) {
tip.close(); tip.close();
if (json.resCode === 0) { if (json.resCode === 0) {
setTimeout(function () {
data.images.push(json.data.img_url); data.images.push(json.data.img_url);
port.postMessage("chatRoomSendMsg", coder.encode(data)); port.postMessage("chatRoomSendMsg", coder.encode(data));
}, 1000);
} }
}).fail(function () { }).fail(function () {
tip.setState("error", "图片上传失败：服务器开小差了...."); tip.setState("error", "图片上传失败：服务器开小差了....");
@ -230,7 +232,7 @@
if (msg.color) if (msg.color)
msg.color = "#" + msg.color; msg.color = "#" + msg.color;
//咩哈哈哈哈 //咩哈哈哈哈
if (msg.fromUser === "iccfish" || msg.fromUser.username === "imfish") { if (msg.fromUser.username === "iccfish" || msg.fromUser.username === "imfish") {
msg.fromUser.realname = "木魚"; msg.fromUser.realname = "木魚";
msg.fromUser.exStyle = "font-weight:bold;"; msg.fromUser.exStyle = "font-weight:bold;";
} }
@ -356,6 +358,7 @@
editor.find(">header .chat-editor-color").val(color); editor.find(">header .chat-editor-color").val(color);
editor.find(".chat-editor-container").css("color", color); editor.find(".chat-editor-container").css("color", color);
};
faceSelector.click(function () { faceSelector.click(function () {
editor.find(">header>.popup-smail").toggleClass("popup-smail-on"); editor.find(">header>.popup-smail").toggleClass("popup-smail-on");
loadImgIcons(); loadImgIcons();
@ -379,7 +382,6 @@
$(".chat-items").on("click", ".chat-item > section > img", function () { $(".chat-items").on("click", ".chat-item > section > img", function () {
$(this).colorbox({ html: this.outerHTML }); $(this).colorbox({ html: this.outerHTML });
}); });
};
var delayEnableSend = function () { var delayEnableSend = function () {
sendBtn.prop("disabled", true); sendBtn.prop("disabled", true);
setTimeout(function () { setTimeout(function () {
@ -491,7 +493,7 @@
var authorlink = item.find(".chat-item-at:eq(0)")[0]; var authorlink = item.find(".chat-item-at:eq(0)")[0];
var username = authorlink.dataset.un; var username = authorlink.dataset.un;
if (username === '*') { if (username === '*' || username === "imfish" || username === "iccfish") {
mp.showMessagePopup("error", "亲，不可以举报我们伟大的管理员哦 ♪(´ε｀)"); mp.showMessagePopup("error", "亲，不可以举报我们伟大的管理员哦 ♪(´ε｀)");
return; return;
} }