Resolved a few issues

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wutil.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wutil.js
index a47cb4f047414b2ca57b587faebe1cc02eab176a..4fe2b32b1b94f52a2ee55a4fb44da458ee5ff65a 100644 (file)
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wutil.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wutil.js
@@ -39,12 +39,12 @@ RedactorPlugins.wutil = function() {
                        this.wutil.setOption('autosave', false);
                        
                        // disable autosave on destroy
-                       var $mpDestroy = this.destroy;
-                       var self = this;
-                       this.destroy = function() {
-                               self.autosaveDisable();
-                               $mpDestroy.call(self);
-                       };
+                       var $mpDestroy = this.core.destroy;
+                       this.core.destroy = (function() {
+                               this.wutil.autosaveDisable();
+                               
+                               $mpDestroy.call(this);
+                       }).bind(this);
                },
                
                /**
@@ -239,7 +239,7 @@ RedactorPlugins.wutil = function() {
                 * Disables automatic saving.
                 */
                autosaveDisable: function() {
-                       if (!this.getOption('woltlab.autosave').active) {
+                       if (!this.wutil.getOption('woltlab.autosave').active) {
                                return false;
                        }
                        

diff --git a/wcfsetup/install/files/js/WCF.ImageViewer.js b/wcfsetup/install/files/js/WCF.ImageViewer.js
index c2662189b102171bea51e08f0030ddb9e3f48ec4..2ef5d5e0eae2b9cdb47da1ca017b8be2620d7e8b 100644 (file)
--- a/wcfsetup/install/files/js/WCF.ImageViewer.js
+++ b/wcfsetup/install/files/js/WCF.ImageViewer.js
@@ -92,8 +92,8 @@ WCF.ImageViewer = Class.extend({
                        });
                        
                        if (!$image.parents('a').length) {
-                               $image.wrap('<a href="' + $image.attr('src') + '" />');
-                               $image.parent().slimbox();
+                               $image.wrap('<a href="' + $image.attr('src') + '" class="jsImageViewerEnabled" />');
+                               $image.parent().click($.proxy(this._click, this));
                        }
                }
        }

diff --git a/wcfsetup/install/files/js/WCF.Message.js b/wcfsetup/install/files/js/WCF.Message.js
index 46d58b51f1f6ebdd992c06b460434719fdce052d..f6c005e948896f955d78ee6f7f8b2d556a9e526d 100644 (file)
--- a/wcfsetup/install/files/js/WCF.Message.js
+++ b/wcfsetup/install/files/js/WCF.Message.js
@@ -1527,7 +1527,7 @@ WCF.Message.InlineEditor = Class.extend({
                var $message = '';
                
                if ($.browser.redactor) {
-                       $message = $('#' + this._messageEditorIDPrefix + $objectID).redactor('getText');
+                       $message = $('#' + this._messageEditorIDPrefix + $objectID).redactor('wutil.getText');
                }
                else {
                        $message = $('#' + this._messageEditorIDPrefix + $objectID).val();
@@ -1563,7 +1563,7 @@ WCF.Message.InlineEditor = Class.extend({
                var $message = '';
                
                if ($.browser.redactor) {
-                       $message = $('#' + this._messageEditorIDPrefix + $objectID).redactor('getText');
+                       $message = $('#' + this._messageEditorIDPrefix + $objectID).redactor('wutil.getText');
                }
                else {
                        $message = $('#' + this._messageEditorIDPrefix + $objectID).val();
@@ -1656,8 +1656,8 @@ WCF.Message.InlineEditor = Class.extend({
                // destroy editor
                if ($.browser.redactor) {
                        var $target = $('#' + this._messageEditorIDPrefix + $container.data('objectID'));
-                       $target.redactor('autosavePurge');
-                       $target.redactor('destroy');
+                       $target.redactor('wutil.autosavePurge');
+                       $target.redactor('core.destroy');
                }
                
                // purge DOM elements

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index db648e65212e0e85416c5c08b97921c00197d04e..910d695dcd3935141b16042c069cba40df08ebb8 100755 (executable)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -3820,7 +3820,7 @@ WCF.String = {
         */
        formatNumeric: function(number, decimalPlaces) {
                number = String(WCF.Number.round(number, decimalPlaces || 2));
-               numberParts = number.split('.');
+               var numberParts = number.split('.');
                
                number = this.addThousandsSeparator(numberParts[0]);
                if (numberParts.length > 1) number += WCF.Language.get('wcf.global.decimalPoint') + numberParts[1];

diff --git a/wcfsetup/install/files/style/redactor.less b/wcfsetup/install/files/style/redactor.less
index aea00cd622f462927b405e6c4dd887f1bc320880..bf909d29a4fbb1eb165db7be72d1f22827139555 100644 (file)
--- a/wcfsetup/install/files/style/redactor.less
+++ b/wcfsetup/install/files/style/redactor.less
@@ -99,6 +99,10 @@
                list-style-type: decimal;
        }
        
+       img {
+               max-width: 100%;
+       }
+       
        table {
                border-collapse: collapse;
                font-size: 14px;