From a72cbce9a150aeee763b916574d2faf62ed4b090 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 30 Jul 2018 13:52:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8D=E8=AE=BE=E7=BD=AE=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap3/header.php | 2 +-
 js/kindeditor/kindeditor.js             | 2 +-
 js/kindeditor/plugins/link/link.js      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index 1bf173bc..664cc98d 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -6,7 +6,7 @@
         <title>信息平台</title>
         <link rel="stylesheet" href="/css/information-system3.css?v=201508112" type="text/css" />
         <script type="text/javascript" src="/min/?f=/js/information-system3.min.js,/js/common.js&v=2018022601"></script>
-        <script type="text/javascript" src="/js/kindeditor/kindeditor.js?v=20180725"></script>
+        <script type="text/javascript" src="/js/kindeditor/kindeditor.js?v=20180730"></script>
         <link rel="shortcut icon" href="/bootstrap/img/glyphicons_290_skull.png">
 
         <script language="javascript">
diff --git a/js/kindeditor/kindeditor.js b/js/kindeditor/kindeditor.js
index 395f7ea4..c138a280 100644
--- a/js/kindeditor/kindeditor.js
+++ b/js/kindeditor/kindeditor.js
@@ -17,7 +17,7 @@ if (!window.console) {
 if (!console.log) {
 	console.log = function () {};
 }
-var _VERSION = '4.1.6 (2013-03-24) 20180725',
+var _VERSION = '4.1.6 (2013-03-24) 20180730',
 	_ua = navigator.userAgent.toLowerCase(),
 	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
 	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
diff --git a/js/kindeditor/plugins/link/link.js b/js/kindeditor/plugins/link/link.js
index f6b4ddd5..8d38e1ab 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="1">是</option><option value="0">否</option></select>' +
+					'<select id="nofollow" name="nofollow" style="width:260px;"><option selected="selected" value="0">否</option><option value="1">是</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="1">是</option><option value="0">否</option></select>' +
+					'<select id="thirdlink" name="thirdlink" style="width:260px;"><option selected="selected" value="0">否</option><option value="1">是</option></select>' +
 					'</div>' +
 					'</div>',
 				dialog = self.createDialog({
@@ -57,8 +57,8 @@ KindEditor.plugin('link', function(K) {
 				thirdlinkBox = K('select[name="thirdlink"]', div),
 				typeBox = K('select[name="type"]', div);
 			urlBox.val('http://');
-			typeBox[0].options[0] = new Option(lang.newWindow, '_blank');
-			typeBox[0].options[1] = new Option(lang.selfWindow, '');
+			typeBox[0].options[0] = new Option(lang.selfWindow, '');
+			typeBox[0].options[1] = new Option(lang.newWindow, '_blank');
 			self.cmd.selection();
 			var a = self.plugin.getSelectedLink();
 			if (a) {