Merge branch 'develop'

alswl · Nov 7, 2011 · bac67e8 · bac67e8
2 parents 97e7841 + 2e878d9
commit bac67e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/demo.html b/demo.html
@@ -22,7 +22,8 @@ <h1>jEmotion Demo</h1>
 	<div>a(#偷笑)(#怒)b(#左哼哼)(#泪)c(#左哼哼) [左边的文本将会被转换成表情]</div>
 	<textarea id="question" style="width:600px;height:180px;" placeholder="Write here"></textarea>
 	</br>
-	<a href="javascript:;" class="emotion">Add a emotion</a>
+	<span style="text-decoration:underline;cursor:pointer;" class="emotion">Add a emotion</span>
+	<span>（左边这个触发按钮如果使用 a 的话，会造成IE6截断http连接，不能正确读取Ajax图片，推荐使用span来模拟a）</span>
 	</br>
 	<input type="submit"/>
 

diff --git a/jQuery.jEmotion.js b/jQuery.jEmotion.js
@@ -57,7 +57,7 @@ var jEmotion = {
      * 插入html到页面
      */
 	insertHtml: function(imagePath, smilesMaps) {
-		var html = '<style>#je_emotions{width:364px; position:absolute;border:1px solid #aaa;border-top:none;z-index:9999; text-align:center;padding:3px;padding-bottom:6px;background:#fff;} #je_emotions a img{float:left;cursor:pointer;margin:1px 1px; border:#cacaca 1px solid}  #je_emotions a:hover img{border:1px solid #f51d69} </style>';
+		var html = '<style>#je_emotions{width:364px; position:absolute;border:1px solid #aaa;border-top:none;z-index:9999; text-align:center;padding:3px;padding-bottom:6px;background:#fff;} #je_emotions a img{float:left;cursor:pointer;margin:1px 1px; border:#cacaca 1px solid;visibility:visible;}  #je_emotions a:hover img{border:1px solid #f51d69} </style>';
 		html += '<div id="je_emotions">';
 		for (i in smilesMaps) {
 			html += '<a href="javascript:;">' +