From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 14 Jun 2013 13:12:58 +0000 (+0200)
Subject: Added divarea plugin
X-Git-Tag: 2.0.0_Beta_4~42
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=78e9a6cab215dce777438f521aee1abf405140a1;p=GitHub%2FWoltLab%2FWCF.git

Added divarea plugin
---

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index ce745024f5..5013051f98 100644
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -36,7 +36,7 @@ $(function() {
 	
 	var $config = {
 		smiley_path: '{@$__wcf->getPath()|encodeJS}',
-		extraPlugins: 'wbbcode,wbutton',
+		extraPlugins: 'wbbcode,wbutton,divarea',
 		removePlugins: 'contextmenu,tabletools,liststyle,elementspath,menubutton,forms,scayt',
 		language: '{@$__wcf->language->getFixedLanguageCode()}',
 		fontSize_sizes: '8/8pt;10/10pt;12/12pt;14/14pt;18/18pt;24/24pt;36/36pt;',
diff --git a/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/divarea/plugin.js b/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/divarea/plugin.js
new file mode 100644
index 0000000000..cce6c0a5c4
--- /dev/null
+++ b/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/divarea/plugin.js
@@ -0,0 +1,36 @@
+/**
+ * @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.html or http://ckeditor.com/license
+ */
+
+/**
+ * @fileOverview The "divarea" plugin. It registers the "wysiwyg" editing
+ *		mode using a DIV element.
+ */
+
+CKEDITOR.plugins.add( 'divarea', {
+	afterInit: function( editor ) {
+		// Add the "wysiwyg" mode.
+		// Do that in the afterInit function, so it'll eventually overwrite
+		// the mode defined by the wysiwygarea plugin.
+		editor.addMode( 'wysiwyg', function( callback ) {
+			var editingBlock = CKEDITOR.dom.element.createFromHtml( '<div class="cke_wysiwyg_div cke_reset" hidefocus="true"></div>' );
+
+			var contentSpace = editor.ui.space( 'contents' );
+			contentSpace.append( editingBlock );
+
+			editingBlock = editor.editable( editingBlock );
+
+			editingBlock.detach = CKEDITOR.tools.override( editingBlock.detach,
+				function( org ) {
+					return function() {
+						org.apply( this, arguments );
+						this.remove();
+					};
+				});
+
+			editor.setData( editor.getData( 1 ), callback );
+			editor.fire( 'contentDom' );
+		});
+	}
+});
diff --git a/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wbbcode/plugin.js b/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wbbcode/plugin.js
index edc7c7f323..987fc6a2a8 100644
--- a/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wbbcode/plugin.js
+++ b/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wbbcode/plugin.js
@@ -53,6 +53,9 @@
 		});
 		
 		insertFakeSubmitButton(event);
+		
+		// remove stupid title tag
+		$(event.editor.container.$).find(".cke_wysiwyg_div").removeAttr('title');
 	});
 	
 	/**
diff --git a/wcfsetup/install/files/style/message.less b/wcfsetup/install/files/style/message.less
index d1040713e2..2bed2d9ed3 100644
--- a/wcfsetup/install/files/style/message.less
+++ b/wcfsetup/install/files/style/message.less
@@ -870,7 +870,8 @@ li:nth-child(2n+1) .message {
 	padding: 0 !important;
 }
 
-.cke_source {
+.cke_source,
+.cke_wysiwyg_div {
 	padding: 8px !important;
 }
 
@@ -882,6 +883,11 @@ li:nth-child(2n+1) .message {
 	background-color: #000 !important;
 }
 
+.cke_wysiwyg_div,
+.cke_inner {
+	background-color: transparent !important;
+}
+
 @media only screen and (max-width: 800px) {
 	.message.messageSidebarOrientationLeft,
 	.message.messageSidebarOrientationRight {