Updated templates (WIP)
authorAlexander Ebert <ebert@woltlab.com>
Sun, 5 Oct 2014 16:29:29 +0000 (18:29 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 5 Oct 2014 16:29:29 +0000 (18:29 +0200)
com.woltlab.wcf/templates/wysiwyg.tpl
wcfsetup/install/files/js/WCF.Message.js

index ea8e7153b3904dc1d111ad8458d3aa0f9a09d61f..a477148ea6007cb876fa270e97064cf2b31f57d3 100644 (file)
@@ -30,7 +30,15 @@ $(function() {
                
                var $autosave = $textarea.data('autosave');
                var $config = {
+                       autosave: false,
                        buttons: $buttons,
+                       buttonSource: true,
+                       imageResizable: false,
+                       removeEmpty: false,
+                       replaceDivs: false,
+                       tabifier: false,
+                       
+                       {* TODO: possible outdated/deprecated options below *}
                        convertDivs: false,
                        convertImageLinks: false,
                        convertLinks: false,
@@ -38,10 +46,9 @@ $(function() {
                        direction: '{lang}wcf.global.pageDirection{/lang}',
                        lang: '{@$__wcf->getLanguage()->getFixedLanguageCode()}',
                        minHeight: 200,
-                       imageResizable: false,
-                       plugins: [ 'wutil',  'wmonkeypatch', 'wbutton', 'wbbcode',  'wfontcolor', 'wfontfamily', 'wfontsize', 'wupload' ],
+                       plugins: [ 'wutil',  'wmonkeypatch', 'table', 'wbutton', 'wbbcode',  'wfontcolor', 'wfontfamily', 'wfontsize', 'wupload' ],
                        wautosave: {
-                               active: ($autosave) ? true : false,
+                               active: (/* DEBUG ONLY $autosave*/false) ? true : false,
                                key: ($autosave) ? '{@$__wcf->getAutosavePrefix()}_' + $autosave : '',
                                saveOnInit: {if !$errorField|empty}true{else}false{/if}
                        },
@@ -64,6 +71,10 @@ $(function() {
                {if !ENABLE_DEBUG_MODE}
                        '{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wcombined.min.js?v={@LAST_UPDATE_TIME}',
                {else}
+                       {* official *}
+                       '{@$__wcf->getPath()}js/3rdParty/redactor/plugins/table.js?v={@LAST_UPDATE_TIME}',
+                       
+                       {* WoltLab *}
                        '{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wbbcode.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wbutton.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wfontcolor.js?v={@LAST_UPDATE_TIME}',
index d0369355909a3bf5746e07dcaa149155310136ee..fa2597d26d58d658584ba66d6d5159c5c3715ff2 100644 (file)
@@ -824,8 +824,10 @@ WCF.Message.QuickReply = Class.extend({
                if (this._container.is(':visible')) {
                        this._quickReplyButtons.hide();
                        
-                       var self = this;
-                       window.setTimeout(function() { self._scroll.scrollTo(self._container, true); }, 100);
+                       setTimeout((function() {
+                               $(document).trigger('resize');
+                               this._scroll.scrollTo(this._container, true);
+                       }).bind(this), 100);
                        
                        WCF.Message.Submit.registerButton('text', this._container.find('.formSubmit button[data-type=save]'));