From e1c6be4bf3f84914c3e1a110afddb38985b744c7 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Fri, 6 Mar 2015 19:47:31 +0900
Subject: [PATCH] =?UTF-8?q?#1087=20ckeditor=20=EC=A0=95=EB=A6=AC=20-=20xeE?=
 =?UTF-8?q?ditor=20plugin=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20app=EB=A1=9C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20-=20ckeditor=20config=EB=A5=BC=20app=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20-=20?=
 =?UTF-8?q?=ED=88=B4=EB=B0=94=20=EC=A0=91=EA=B8=B0=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=EC=9D=B4=20=EC=9E=98=EB=AA=BB=20=EB=B0=98=EC=98=81=EB=90=9C=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xe_component/icons/xe_component.png       | Bin 3634 -> 0 bytes
 common/js/plugins/ckeditor/plugin.load        |   1 -
 common/js/plugins/ckeditor/xeEditor.plugin.js |  76 --------------
 modules/editor/editor.model.php               |   3 +
 modules/editor/skins/ckeditor/css/default.css |   6 ++
 modules/editor/skins/ckeditor/editor.html     |  44 ++------
 modules/editor/tpl/js/editor.app.js           |  98 ++++++++++++++++--
 7 files changed, 109 insertions(+), 119 deletions(-)
 delete mode 100755 common/js/plugins/ckeditor/ckeditor/plugins/xe_component/icons/xe_component.png
 delete mode 100644 common/js/plugins/ckeditor/xeEditor.plugin.js

diff --git a/common/js/plugins/ckeditor/ckeditor/plugins/xe_component/icons/xe_component.png b/common/js/plugins/ckeditor/ckeditor/plugins/xe_component/icons/xe_component.png
deleted file mode 100755
index 46a7abf9f82ffe51f56d15411fef40ea683eb80b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3634
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
EU%wYh!vFvP

diff --git a/common/js/plugins/ckeditor/plugin.load b/common/js/plugins/ckeditor/plugin.load
index c0bdf24b6..c7daa20d2 100644
--- a/common/js/plugins/ckeditor/plugin.load
+++ b/common/js/plugins/ckeditor/plugin.load
@@ -1,2 +1 @@
 ckeditor/ckeditor.js
-xeEditor.plugin.js
diff --git a/common/js/plugins/ckeditor/xeEditor.plugin.js b/common/js/plugins/ckeditor/xeEditor.plugin.js
deleted file mode 100644
index d402c202f..000000000
--- a/common/js/plugins/ckeditor/xeEditor.plugin.js
+++ /dev/null
@@ -1,76 +0,0 @@
-(function($){
-	"use strict";
-	var App = window.xe.getApp('xeEditorApp')[0];
-	var CK = window.CKEDITOR;
-
-	var xeCKEditor = App.createPlugin("CKEditor", {
-		instance_prefix : 'ckeditor_instance_',
-
-		init : function() {
-			var self = this;
-			CKEDITOR.on('instanceCreated', function(evt){
-				self.cast('CKEDITOR_CREATED');
-			});
-
-			CKEDITOR.on('ready', function(evt){
-				self.cast('CKEDITOR_READY');
-			});
-
-			CKEDITOR.on('instanceReady', function(evt){
-				self.cast('CKEDITOR_INSTANCE_READY');
-			});
-
-			CKEDITOR.on('instanceLoaded', function(evt){
-				self.cast('CKEDITOR_LOADED');
-			});
-		},
-		editorInit : function(sequence, obj) {
-			var self = this;
-			var $editor_area = jQuery("#ckeditor_instance_"+sequence);
-			var $form     = $editor_area.closest('form');
-			var $contentField = $('input[name=' + obj.content_key + ']');
-			var ckconfig = obj.ckconfig || {};
-			ckconfig.xe_editor_sequence = sequence;
-
-			$form.attr('editor_sequence', sequence);
-
-			var insance = CKEDITOR.appendTo(this.instance_prefix + sequence, ckconfig, obj.content);
-			$editor_area.data('cke_instance', insance);
-
-			insance.on('change', function(e){
-				if($contentField.length){
-					$contentField.val(e.editor.getData());
-				}
-			});
-			this.sequence = sequence;
-			window.editorRelKeys[sequence] = {};
-			window.editorRelKeys[sequence].primary   = $form.find('[name='+obj.primary_key+']')[0];
-			window.editorRelKeys[sequence].content   = $form.find('[name='+obj.content_key+']')[0];
-			window.editorRelKeys[sequence].func      = function(seq) {
-				return self.getContent.call(self, seq);
-			};
-			window.editorRelKeys[sequence].pasteHTML = function(text){
-				insance.insertHtml(text, 'html');
-			};
-		},
-		getContent : function(seq) {
-			var self = this;
-			var content = _getCkeInstance(seq).getData();
-			self.cast('GET_CONTENT', [content]);
-
-			return content;
-		},
-		API_ONREADY : function() {
-		},
-		API_GET_CONTENT: function() {
-		},
-		getInstance : function(name) {
-			return CKEDITOR.instances[name];
-		},
-		autosave: function(seq) {
-
-		}
-	});
-
-	App.registerPlugin(new xeCKEditor());
-})(jQuery);
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index 4aefa2a1e..557d6fa02 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -208,6 +208,7 @@ class editorModel extends editor
 		if(!$colorset) $colorset = 'moono';
 		Context::set('colorset', $colorset);
 		Context::set('skin', $skin);
+		Context::set('module_type', $option->module_type);
 
 		if($skin=='dreditor')
 		{
@@ -332,6 +333,7 @@ class editorModel extends editor
 		$editor_config = $this->getEditorConfig($module_srl);
 
 		$config = new stdClass();
+		$config->module_type = $type;
 
 		// Configurations listed according to a type
 		if($type == 'document')
@@ -374,6 +376,7 @@ class editorModel extends editor
 		}
 		// Pre-set option variables of editor
 		$option = new stdClass();
+		$option->module_type = $config->module_type;
 		$option->skin = $config->editor_skin;
 		$option->content_style = $config->content_style;
 		$option->content_font = $config->content_font;
diff --git a/modules/editor/skins/ckeditor/css/default.css b/modules/editor/skins/ckeditor/css/default.css
index e69de29bb..b0620a956 100755
--- a/modules/editor/skins/ckeditor/css/default.css
+++ b/modules/editor/skins/ckeditor/css/default.css
@@ -0,0 +1,6 @@
+.cke_button__xe_component_label {
+	display: inline !important;
+}
+.cke_button__xe_component_icon {
+	display: none !important;
+}
diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html
index ee4294ed9..580902cd5 100755
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@@ -22,7 +22,7 @@
 	{@ $css_content .= chr(125);}
 <!--@endif-->
 
-<div id="ckeditor_instance_{$editor_sequence}"></div>
+<div id="ckeditor_instance_{$editor_sequence}" data-editor-sequence="{$editor_sequence}" data-editor-primary-key-name="{$editor_primary_key_name}" data-editor-content-key-name="{$editor_content_key_name}" style="min-height:{$editor_height}px;"></div>
 
 <!--%load_js_plugin("jquery.fileupload")-->
 <div cond="$allow_fileupload" id="xe-uploader-container-{$editor_sequence}" class="xe-uploader-container clearfix" data-editor-sequence="{$editor_sequence}">
@@ -58,37 +58,14 @@
 <script>
 (function($){
 	"use strict";
-	var editor_primary_key_name = '{$editor_primary_key_name}';
-	var editor_content_key_name = '{$editor_content_key_name}';
 
 	// editor
 	$(function(){
-		var pl = xe.getApp('xeEditorApp')[0].getPlugin('ckeditor')[0];
-		var editor_id = 'ckeditor_instance_{$editor_sequence}';
-
 		var ckconfig = {
 			height: '{$editor_height}',
-			bodyClass: 'xe_content editable',
-			toolbarCanCollapse: true,
-			toolbarGroups: [
-				{ name: 'clipboard',   groups: [ 'undo', 'clipboard' ] },
-				{ name: 'editing',     groups: [ 'find', 'selection' ] },
-				{ name: 'insert' },
-				{ name: 'tools' },
-				{ name: 'document',    groups: [ 'mode' ] },
-				'/',
-				{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
-				{ name: 'paragraph',   groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] },
-				{ name: 'links' },
-				{ name: 'styles' },
-				{ name: 'colors' },
-				{ name: 'others' }
-			],
 			skin: '{$colorset}',
-			allowedContent: true,
 			contentsCss: '{$content_style_path}/editor.css',
-			removePlugins: 'stylescombo,language',
-			removeButtons: 'Save,Preview,Print,Cut,Copy,Paste'
+			xe_editor_sequence: {$editor_sequence}
 		};
 		<!--@if($enable_component)-->
 			ckconfig.extraPlugins = 'xe_component';
@@ -104,19 +81,19 @@
 
 		<!--@if(!$enable_default_component)-->
 			ckconfig.toolbar = [];
-			ckconfig.toolbarCanCollapse = true;
+			ckconfig.toolbarCanCollapse = false;
+		<!--@endif-->
+
+		<!--@if($module_type === 'comment')-->
+			ckconfig.toolbarStartupExpanded = false;
 		<!--@endif-->
 
 		<!--@if($css_content)-->CKEDITOR.addCss('{$css_content}');<!--@end-->
 
-		pl.editorInit("{$editor_sequence}", {
-			'ckconfig' : ckconfig,
-			'content': jQuery('[name='+editor_content_key_name+']').val(),
-			'primary_key': editor_primary_key_name,
-			'content_key': editor_content_key_name
+		$('#ckeditor_instance_{$editor_sequence}').XeCkEditor({
+			ckeconfig : ckconfig,
+			content_field: jQuery('[name={$editor_content_key_name}]')
 		});
-
-		var INS = pl.getInstance('{$editor_sequence}');
 	});
 
 	// uploader
@@ -131,6 +108,7 @@
 	<!--@endif-->
 })(jQuery);
 </script>
+
 <style>
 .clearfix:before, .clearfix:after {
     content: "";
diff --git a/modules/editor/tpl/js/editor.app.js b/modules/editor/tpl/js/editor.app.js
index 2bda49761..5b938df1b 100644
--- a/modules/editor/tpl/js/editor.app.js
+++ b/modules/editor/tpl/js/editor.app.js
@@ -1,32 +1,112 @@
 (function($){
 	"use strict";
-	var XeEditorApp = xe.createApp('xeEditorApp', {
+	var settings = {
+		bodyClass: 'xe_content editable',
+		toolbarCanCollapse: true,
+		toolbarGroups: [
+			{ name: 'clipboard',   groups: [ 'undo', 'clipboard' ] },
+			{ name: 'editing',     groups: [ 'find', 'selection' ] },
+			{ name: 'insert' },
+			{ name: 'tools' },
+			{ name: 'document',    groups: [ 'mode' ] },
+			'/',
+			{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
+			{ name: 'paragraph',   groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] },
+			{ name: 'links' },
+			{ name: 'styles' },
+			{ name: 'colors' },
+			{ name: 'others' },
+		],
+		allowedContent: true,
+		removePlugins: 'stylescombo,language',
+		removeButtons: 'Save,Preview,Print,Cut,Copy,Paste',
+	};
+
+	var XeCkEditor = xe.createApp('XeCkEditor', {
+		editor_sequence: null,
 		init : function() {
+			var self = this;
+			CKEDITOR.on('instanceCreated', function(evt){
+				self.cast('CKEDITOR_CREATED');
+			});
+
+			CKEDITOR.on('ready', function(evt){
+				self.cast('CKEDITOR_READY');
+			});
+
+			CKEDITOR.on('instanceReady', function(evt){
+				self.cast('CKEDITOR_INSTANCE_READY');
+			});
+
+			CKEDITOR.on('instanceLoaded', function(evt){
+				self.cast('CKEDITOR_LOADED');
+			});
 		},
 		API_ONREADY : function() {
 		},
+		editorInit : function(containerEl, opts) {
+			var self = this;
+			var $containerEl = containerEl;
+			var $form     = $containerEl.closest('form');
+			var $contentField = opts.content_field;
+			var data = $containerEl.data();
+			var editor_sequence = $containerEl.data().editorSequence;
+			var ckeconfig = $.extend({}, settings, opts.ckeconfig || {});
+
+			this.editor_sequence = data.editorSequence;
+
+			$form.attr('editor_sequence', data.editorSequence);
+
+			var insance = CKEDITOR.appendTo($containerEl[0], ckeconfig, $contentField.val());
+			$containerEl.data('cke_instance', insance);
+
+			insance.on('change', function(e){
+				if($contentField.length){
+					$contentField.val(e.editor.getData());
+				}
+			});
+
+			window.editorRelKeys[data.editorSequence] = {};
+			window.editorRelKeys[data.editorSequence].primary   = $form.find('[name='+data.editorPrimaryKeyName+']')[0];
+			window.editorRelKeys[data.editorSequence].content   = $form.find('[name='+data.editorContentKeyName+']')[0];
+			window.editorRelKeys[data.editorSequence].func      = function(seq) {
+				return self.getContent.call(self, seq);
+			};
+			window.editorRelKeys[data.editorSequence].pasteHTML = function(text){
+				insance.insertHtml(text, 'html');
+			};
+		},
 		getContent : function(seq) {
-			this.cast('GET_CONTENT');
+			var self = this;
+			var content = _getCkeInstance(seq).getData();
+			self.cast('GET_CONTENT', [content]);
+
+			return content;
+		},
+		getInstance : function(name) {
+			return CKEDITOR.instances[name];
 		},
 		API_EDITOR_CREATED : function(){
 		},
 	});
 
 	// Shortcut function in jQuery
-	$.fn.xeEditorApp = function(opts) {
-		var u = new XeEditorApp(this.eq(0), opts);
-		if(u) xe.registerApp(u);
+	$.fn.XeCkEditor = function(opts) {
+		var u = new XeCkEditor(this.eq(0), opts);
+
+		if(u) {
+			xe.registerApp(u);
+			u.editorInit(this.eq(0), opts);
+		}
 
 		return u;
 	};
 
 	// Shortcut function in XE
-	window.xe.createXeEditor = function() {
-		var u = new XeEditorApp();
+	window.xe.XeCkEditor = function() {
+		var u = new XeCkEditor();
 
 		return u;
 	};
-	var u = new XeEditorApp();
-	xe.registerApp(u);
 
 })(jQuery);