From 9606ce1caaceec7914a869e83f94cdf180f3cc9e Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 16 Jun 2015 13:35:11 +0800
Subject: [PATCH] =?UTF-8?q?bug#2846:=E7=BC=96=E8=BE=91=E5=99=A8=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=89=93=E5=BC=80=E8=A1=A8=E6=83=85=EF=BC=8C=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9B=B8=E5=85=B3=E8=A1=A8=E6=83=85=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E7=9A=84=E8=A1=A8=E6=83=85=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A1=86=E6=B2=A1=E6=9C=89=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/emoticons/emoticons.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/assets/kindeditor/plugins/emoticons/emoticons.js b/public/assets/kindeditor/plugins/emoticons/emoticons.js
index a9900668b..c89e0c6ee 100644
--- a/public/assets/kindeditor/plugins/emoticons/emoticons.js
+++ b/public/assets/kindeditor/plugins/emoticons/emoticons.js
@@ -13,6 +13,7 @@ KindEditor.plugin('emoticons', function(K) {
 		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
 		currentPageNum = 1;
 	self.clickToolbar(name, function() {
+		this.edit.focus();//如果没有这句 火狐下取不到焦点 导致_getSel()为空 报错 
 		var rows = 5, cols = 9, total = 135, startNum = 0,
 			cells = rows * cols, pages = Math.ceil(total / cells),
 			colsHalf = Math.floor(cols / 2),