Adjustments for renamed redactor editor class

diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabButton.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabButton.js
index 41370b0a072077d41f470dfc80e6ffde0dc4e08a..a46c888a256ec903ccbab68ef3f8e8e7a0ff4fea 100644 (file)
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabButton.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabButton.js
@@ -5,6 +5,9 @@ $.Redactor.prototype.WoltLabButton = function() {
        
        return {
                init: function() {
+                       // tooltips are handled on our own
+                       this.button.buildButtonTooltip = function () {};
+                       
                        // add custom buttons
                        var button, buttonName, i, length;
                        //noinspection JSUnresolvedVariable

diff --git a/wcfsetup/install/files/js/WCF.Message.js b/wcfsetup/install/files/js/WCF.Message.js
index cdd5a38526d72520c2c65fef0e99effe18ccb883..7fc5bfd96180080c444454fe11f44e19e7ea41f8 100644 (file)
--- a/wcfsetup/install/files/js/WCF.Message.js
+++ b/wcfsetup/install/files/js/WCF.Message.js
@@ -1604,7 +1604,7 @@ WCF.Message.Quote.Manager = Class.extend({
         */
        _click: function() {
                var editor = document.activeElement;
-               if (editor.classList.contains('redactor-editor')) {
+               if (editor.classList.contains('redactor-layer')) {
                        $('#' + elData(editor, 'element-id')).redactor('selection.save');
                }
                

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/InlineEditor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/InlineEditor.js
index 838733023074cc0d93fd2456a23a925b5d3ce038..ae39c32867b4162d148b50099a061983bcea376c 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/InlineEditor.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/InlineEditor.js
@@ -649,7 +649,7 @@ define(
                
                _ajaxFailure: function(data) {
                        var elementData = this._elements.get(this._activeElement);
-                       var editor = elBySel('.redactor-editor', elementData.messageBodyEditor);
+                       var editor = elBySel('.redactor-layer', elementData.messageBodyEditor);
                        
                        // handle errors occurring on editor load
                        if (editor === null) {

diff --git a/wcfsetup/install/files/style/bbcode/code.scss b/wcfsetup/install/files/style/bbcode/code.scss
index c7d0c8c02f3d4dd49896807b2dd637c0961d1f66..9173260184c90f6ade58906d86562bd88c2edc2e 100644 (file)
--- a/wcfsetup/install/files/style/bbcode/code.scss
+++ b/wcfsetup/install/files/style/bbcode/code.scss
@@ -1,4 +1,4 @@
-.redactor-editor pre {
+.redactor-layer pre {
        background-color: rgb(255, 255, 255) !important;
        box-shadow: 0 0 3px rgba(0, 0, 0, .12), 0 1px 2px rgba(0, 0, 0, .24);
        border-radius: 2px;

diff --git a/wcfsetup/install/files/style/bbcode/spoiler.scss b/wcfsetup/install/files/style/bbcode/spoiler.scss
index 2aabf6715b94ca007d29a8f7a20e43a2e48fa01b..3cff791f03c6d79e458447d0c0cabbfcab72bced 100644 (file)
--- a/wcfsetup/install/files/style/bbcode/spoiler.scss
+++ b/wcfsetup/install/files/style/bbcode/spoiler.scss
@@ -1,4 +1,4 @@
-.redactor-editor woltlab-spoiler {
+.redactor-layer woltlab-spoiler {
        background-color: $wcfContentBackground;
        box-shadow: 0 0 3px rgba(0, 0, 0, .12), 0 1px 2px rgba(0, 0, 0, .24);
        border-radius: 2px;

diff --git a/wcfsetup/install/files/style/ui/redactor.scss b/wcfsetup/install/files/style/ui/redactor.scss
index f4e0526c06d412a593c42c86b0c15e141075abb6..87214daa512903e9ea8d9db93f191e21f30e1971 100644 (file)
--- a/wcfsetup/install/files/style/ui/redactor.scss
+++ b/wcfsetup/install/files/style/ui/redactor.scss
@@ -23,7 +23,7 @@
        }
 }
 
-.redactor-editor {
+.redactor-layer {
        border: 1px solid $wcfContentBorderInner;
        border-top-width: 0;
        max-height: 500px;
@@ -145,7 +145,7 @@
 
 /* disable auto zoom in mobile safari */
 @include screen-md-down {
-       .redactor-editor {
+       .redactor-layer {
                font-size: 16px;
                max-height: 500px;
        }
@@ -561,7 +561,7 @@
        top: 0;
        z-index: 310;
        
-       .redactor-editor {
+       .redactor-layer {
                max-height: none !important;
                min-height: 0 !important;
        }