Fixed a few issues

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index f98501aaf2d3b02ea8693a0367c2c51fb2690ec0..7ac629d3fed69f655626bec1211f242db0435055 100644 (file)
--- 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 f98501aaf2d3b02ea8693a0367c2c51fb2690ec0..7ac629d3fed69f655626bec1211f242db0435055 100644 (file)
--- 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 dc80b44ec1463407a80aba3c90f20d81998e9cb6..4eb528c3b6f899b1ea285e6351fa068e3ee3e014 100644 (file)
--- 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 9d8065fcc6dee7bfa2a3c610ca1d87b5462244d0..79a4c90a098c4446b8b128b6859d03ff0e716d1b 100644 (file)
--- 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 3fe35a33dce8feec525cb1d502fadb089b96323c..37dbcae768e391773b24f11da5854f99d01e1eb7 100644 (file)
--- 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%;
+}