From 431d5b828353247a9e49b1c0202f04619d307e96 Mon Sep 17 00:00:00 2001
From: iFish <iccfish@qq.com>
Date: Tue, 9 Sep 2014 11:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E7=94=A8=E6=88=B7=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web12306/js/ui/chat/roomsession.js     |  2 +-
 Web12306/js/ui/widget_message_popup.js | 37 +++++++++++++-------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Web12306/js/ui/chat/roomsession.js b/Web12306/js/ui/chat/roomsession.js
index d1d511e..22ee404 100644
--- a/Web12306/js/ui/chat/roomsession.js
+++ b/Web12306/js/ui/chat/roomsession.js
@@ -187,7 +187,7 @@
 		initEditor();
 
 		editor.find(".chat-editor-container").keyup(function (e) {
-			if (e.keyCode === 13 && e.ctrlKey) {
+			if (e.keyCode === 13) {
 				sendBtn.click();
 			}
 		});
diff --git a/Web12306/js/ui/widget_message_popup.js b/Web12306/js/ui/widget_message_popup.js
index 8201b9b..da728a5 100644
--- a/Web12306/js/ui/widget_message_popup.js
+++ b/Web12306/js/ui/widget_message_popup.js
@@ -140,22 +140,6 @@
 	exports.showNonExtensionInstall = function () {
 		var isLb = navigator.userAgent.indexOf("LBBROWSER") != -1;
 		var btns = [
-			{
-				text: "安装猎豹浏览器",
-				type: "primary",
-				callback: function() {
-					window.open("http://dl.liebao.cn/coop/KSBrowser_12306.exe");
-					return false;
-				}
-			},
-			{
-				text: "安装扩展",
-				type: "primary",
-				callback: function() {
-					window.open("http://12306.fishlee.net/crx");
-					return false;
-				}
-			},
 			{
 				text: "刷新",
 				type: "default",
@@ -165,8 +149,25 @@
 				}
 			}
 		];
-		if (isLb)
-			btns.unshift(0);
+		if (isLb) {
+			btns.unshift({
+				text: "安装猎豹浏览器",
+				type: "primary",
+				callback: function() {
+					window.open("http://dl.liebao.cn/coop/KSBrowser_12306.exe");
+					return false;
+				}
+			});
+		} else {
+			btns.unshift({
+				text: "安装扩展",
+				type: "primary",
+				callback: function() {
+					window.open("http://12306.fishlee.net/crx");
+					return false;
+				}
+			});
+		}
 
 		$.showModalDialog("您需要安装" + (isLb ? "" : "<u>猎豹浏览器</u>和") + "<u>最新版12306订票助手扩展</u>才可以使用极速版订票。请安装后刷新此页面 :-)", {
 			image: "/images/cat.png",