From b09c09d64843e3cc78d552680b5951737ea4ea7d Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 26 Jul 2018 15:59:19 +0800
Subject: [PATCH] =?UTF-8?q?CHT=20=E4=BF=AE=E6=94=B9=E8=B6=85=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=89=8D=E7=BC=80https,=20=E9=BB=98=E8=AE=A4nofollow,?=
 =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/kindeditor/kindeditor.js        | 6 +++---
 js/kindeditor/plugins/link/link.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/kindeditor/kindeditor.js b/js/kindeditor/kindeditor.js
index b6c39e8e..5a521f49 100644
--- a/js/kindeditor/kindeditor.js
+++ b/js/kindeditor/kindeditor.js
@@ -3207,9 +3207,9 @@ _extend(KCmd, {
 		var thirdlink=false
 		if (arguments[3] && arguments[3]=='1') {
 			if(url.indexOf("www.chinahighlights.com") < 0 ){
-			    url='http://www.chinahighlights.com'+url;
+			    url='https://www.chinahighlights.com'+url;
 			}
-			url ='http://www.chinahighlights.com/redirect.asp?url='+url+'&t=78002';
+			url ='https://www.chinahighlights.com/redirect.asp?url='+url+'&t=78002';
 			thirdlink=true;
 		};
 
@@ -5780,7 +5780,7 @@ _plugin('core', function(K) {
 			html = html.replace(/class=\"MsoNormal\"/gi, '');
 			html = html.replace(/file\:\/\/C:/gi, '');
 			html = html.replace(/<p class=\"MsoListParagraph\"/gi, '<li');
-			
+
 			self.insertHtml(html, true);
 		}
 		K(doc.body).bind('paste', function(e){
diff --git a/js/kindeditor/plugins/link/link.js b/js/kindeditor/plugins/link/link.js
index c2117575..f6b4ddd5 100644
--- a/js/kindeditor/plugins/link/link.js
+++ b/js/kindeditor/plugins/link/link.js
@@ -25,12 +25,12 @@ KindEditor.plugin('link', function(K) {
 					//nofollow
 					'<div class="ke-dialog-row"">' +
 					'<label for="nofollow" style="width:60px;">nofollow</label>' +
-					'<select id="nofollow" name="nofollow" style="width:260px;"><option selected="selected" value="0">否</option><option value="1">是</option></select>' +
+					'<select id="nofollow" name="nofollow" style="width:260px;"><option selected="selected" value="1">是</option><option value="0">否</option></select>' +
 					'</div>' +
 					//跟踪代码
 					'<div class="ke-dialog-row"">' +
 					'<label for="thirdlink" style="width:60px;">跟踪链接</label>' +
-					'<select id="thirdlink" name="thirdlink" style="width:260px;"><option selected="selected" value="0">否</option><option value="1">是</option></select>' +
+					'<select id="thirdlink" name="thirdlink" style="width:260px;"><option selected="selected" value="1">是</option><option value="0">否</option></select>' +
 					'</div>' +
 					'</div>',
 				dialog = self.createDialog({