From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 27 Aug 2016 16:39:58 +0000 (+0200)
Subject: Fixed a few issues
X-Git-Tag: 3.0.0_Beta_1~453
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c2e8d0f6c066a407007d678ea887a51909d5e87d;p=GitHub%2FWoltLab%2FWCF.git

Fixed a few issues
---

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index f98501aaf2..7ac629d3fe 100644
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -220,6 +220,7 @@
 				// slight delay to allow Redactor to initialize itself
 				window.setTimeout(function() {
 					$(element).redactor('code.set', content);
+					$(element).redactor('core.editor')[0].classList.add('redactorReady');
 				}, 10);
 			};
 			
diff --git a/wcfsetup/install/files/acp/templates/wysiwyg.tpl b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
index f98501aaf2..7ac629d3fe 100644
--- a/wcfsetup/install/files/acp/templates/wysiwyg.tpl
+++ b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
@@ -220,6 +220,7 @@
 				// slight delay to allow Redactor to initialize itself
 				window.setTimeout(function() {
 					$(element).redactor('code.set', content);
+					$(element).redactor('core.editor')[0].classList.add('redactorReady');
 				}, 10);
 			};
 			
diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabSource.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabSource.js
index dc80b44ec1..4eb528c3b6 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabSource.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabSource.js
@@ -12,6 +12,8 @@ $.Redactor.prototype.WoltLabSource = function() {
 				mpHide.call(this);
 				
 				setTimeout(this.focus.end.bind(this), 100);
+				
+				this.placeholder.enable();
 			}).bind(this);
 			
 			var textarea = this.source.$textarea[0];
diff --git a/wcfsetup/install/files/style/ui/message.scss b/wcfsetup/install/files/style/ui/message.scss
index 9d8065fcc6..79a4c90a09 100644
--- a/wcfsetup/install/files/style/ui/message.scss
+++ b/wcfsetup/install/files/style/ui/message.scss
@@ -601,8 +601,5 @@
 }
 
 #messageQuickReply .messageSidebar {
-	-webkit-filter: grayscale(1);
-	filter: grayscale(1);
-	
 	opacity: .6;
 }
diff --git a/wcfsetup/install/files/style/ui/redactor.scss b/wcfsetup/install/files/style/ui/redactor.scss
index 3fe35a33dc..37dbcae768 100644
--- a/wcfsetup/install/files/style/ui/redactor.scss
+++ b/wcfsetup/install/files/style/ui/redactor.scss
@@ -1,12 +1,3 @@
-.wysiwygTextarea {
-	background-color: transparent !important;
-	border: 1px solid $wcfContentBorderInner !important;
-	color: transparent !important;
-	display: block;
-	height: 238px;
-	width: 100%;
-}
-
 .redactor-box {
 	position: relative;
 	
@@ -77,6 +68,7 @@
 		color: $wcfContentDimmedText;
 		content: attr(placeholder);
 		display: block;
+		pointer-events: none;
 		position: absolute;
 	}
 	
@@ -489,3 +481,12 @@
 .smiley {
 	margin: 0 1px;
 }
+
+.wysiwygTextarea {
+	background-color: transparent !important;
+	border: 1px solid $wcfContentBorderInner !important;
+	color: transparent !important;
+	display: block;
+	height: 238px;
+	width: 100%;
+}