From 8ea943031849591fc100961876df980d72df05a4 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 4 Jan 2016 15:51:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?at=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/assets/kindeditor/at/config.js | 2 +-
public/assets/kindeditor/at/jquery.atwho.css | 3 ++-
public/assets/kindeditor/plugins/code/previewcode.css | 3 ++-
public/javascripts/application.js | 11 -----------
public/stylesheets/new_user.css | 1 +
public/stylesheets/public.css | 1 +
6 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/public/assets/kindeditor/at/config.js b/public/assets/kindeditor/at/config.js
index 2bab7eb67..651f33464 100644
--- a/public/assets/kindeditor/at/config.js
+++ b/public/assets/kindeditor/at/config.js
@@ -35,7 +35,7 @@ var enableAt = function(_editor) {
var at_config = {
at: "@",
data: names,
- insertTpl: '@${name}(${login})',
+ insertTpl: '@${name}(${login})',
displayTpl: "${name} ${login}",
searchKey: 'searchKey',
limit: 200
diff --git a/public/assets/kindeditor/at/jquery.atwho.css b/public/assets/kindeditor/at/jquery.atwho.css
index df3ff9d94..13ca0265a 100644
--- a/public/assets/kindeditor/at/jquery.atwho.css
+++ b/public/assets/kindeditor/at/jquery.atwho.css
@@ -49,4 +49,5 @@
}
/* @功能 定义 */
-span.at {color:#269ac9;}
\ No newline at end of file
+span.at {color:#269ac9;}
+span.at a{color:#269ac9;text-decoration: none;}
\ No newline at end of file
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index c106a72f3..c8e5df4e1 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -45,4 +45,5 @@
.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;}
-span.at {color:#269ac9;}
\ No newline at end of file
+span.at {color:#269ac9;}
+span.at a{color:#269ac9;text-decoration: none;}
\ No newline at end of file
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 3d9fba942..84186a0b2 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -991,14 +991,3 @@ function showNormalImage(id) {
}
}
-
-$(function(){
- //at 加链接
- $("span.at").hover(function(){
- $(this).css('cursor', 'pointer');
- });
- $("span.at").live('click', function(){
- var userId = $(this).attr('data-user-id');
- $(window.location).attr('href', '/users/'+userId);
- });
-});
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 775ade128..fbd2bc7c5 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1387,6 +1387,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
/* @功能 定义 */
span.at {color:#269ac9;}
+span.at a{color:#269ac9;text-decoration: none;}
.relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
/*问题状态图片*/
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 51f0be25d..a736ef777 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -918,6 +918,7 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r
/* @功能 定义 */
span.at {color:#269ac9;}
+span.at a{color:#269ac9;text-decoration: none;}
.del_line{text-decoration:line-through !important;}
/*转发样式*/
.shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}
From 1b177a849840cca95119e5677b92f25b802fc763 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 5 Jan 2016 11:55:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=A6=81=E7=94=A8?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/rails_kindeditor/lib/rails_kindeditor/helper.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
index a2fef6174..50fc50b38 100644
--- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
+++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
@@ -14,7 +14,7 @@ module RailsKindeditor
output = ActiveSupport::SafeBuffer.new
output << text_area_tag(name, content, input_html)
output << javascript_tag(js_replace(id, options.merge(window_onload: 'true',
- :autoHeightMode=>true,
+ :autoHeightMode=>false,
afterCreate: eval_str(at_id, at_type),
emotionsBasePath: 'http://' + Setting.host_name
)))
@@ -29,7 +29,7 @@ module RailsKindeditor
output_buffer = ActiveSupport::SafeBuffer.new
output_buffer << build_text_area_tag(name, method, self, options, input_html)
output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true',
- :autoHeightMode=>true,
+ :autoHeightMode=>false,
afterCreate: eval_str(at_id, at_type),
emotionsBasePath: 'http://' + Setting.host_name
)))