From 8705bc05c04337cc8a6de9d45673ff150479c053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Thu, 29 Aug 2019 14:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=81=E6=AD=A2=E5=88=A0=E9=99=A4=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD=E5=85=83=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wysiwyg/ckfinder/config.php | 18 ++++++++++++++++++
 wysiwyg/config.js           | 15 ++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/wysiwyg/ckfinder/config.php b/wysiwyg/ckfinder/config.php
index 7d5afe08..4c41cac6 100644
--- a/wysiwyg/ckfinder/config.php
+++ b/wysiwyg/ckfinder/config.php
@@ -78,6 +78,24 @@ switch ($sitecode){
 	case 'ah':
 		$site_url='https://data.asiahighlights.com';
 		break;
+	case 'vc':
+		$site_url='https://data.voyageschine.com';
+		break;
+	case 'jp':
+		$site_url='https://data.arachina.com';
+		break;
+	case 'vac':
+		$site_url='https://data.viaje-a-china.com';
+		break;
+	case 'it':
+		$site_url='https://data.viaggio-in-cina.it';
+		break;
+	case 'ru':
+		$site_url='https://data.chinahighlights.ru';
+		break;
+	case 'ct':
+		$site_url='https://data.chinatravel.com';
+		break;
 	default:
 		$site_url='';
 }
diff --git a/wysiwyg/config.js b/wysiwyg/config.js
index d201b47e..82a09097 100644
--- a/wysiwyg/config.js
+++ b/wysiwyg/config.js
@@ -18,7 +18,8 @@ CKEDITOR.editorConfig = function( config ) {
 	
 	
 	config.toolbarCanCollapse = false;
-	config.scayt_autoStartup = true;
+	//config.scayt_autoStartup = true;//打开自动语法检查
+	//config.scayt_sLang = 'de_DE'; //语法检查语言
 	//config.enterMode = CKEDITOR.ENTER_BR;
 	config.allowedContent = true;
 	config.toolbarGroups = [
@@ -42,10 +43,10 @@ CKEDITOR.editorConfig = function( config ) {
 
 	config.extraPlugins= 'tableresize,uploadimage,image2,codemirror,hianamedia';
 	config.codemirror = {
-		showFormatButton: false,
-		 showCommentButton: false,
-		 showUncommentButton: false,
-		 showAutoCompleteButton: false,
+	showFormatButton: false,
+	showCommentButton: false,
+	showUncommentButton: false,
+	showAutoCompleteButton: false,
 	};
 	config.height=1024;
 	config.width=1024;
@@ -75,3 +76,7 @@ CKEDITOR.editorConfig = function( config ) {
 
 
 };
+//禁止删除空元素
+$.each(CKEDITOR.dtd.$removeEmpty, function (i, value) {
+        CKEDITOR.dtd.$removeEmpty[i] = false;
+});