From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 5 Oct 2014 16:29:29 +0000 (+0200)
Subject: Updated templates (WIP)
X-Git-Tag: 2.1.0_Alpha_1~268^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=65d156423385300496ec5bbe621c1f7b60d48f02;p=GitHub%2FWoltLab%2FWCF.git

Updated templates (WIP)
---

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index ea8e7153b3..a477148ea6 100644
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -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}',
diff --git a/wcfsetup/install/files/js/WCF.Message.js b/wcfsetup/install/files/js/WCF.Message.js
index d036935590..fa2597d26d 100644
--- a/wcfsetup/install/files/js/WCF.Message.js
+++ b/wcfsetup/install/files/js/WCF.Message.js
@@ -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]'));