From: Alexander Ebert Date: Thu, 28 Jan 2016 16:14:00 +0000 (+0100) Subject: Overhauled to top/inline editor buttons X-Git-Tag: 3.0.0_Beta_1~2030^2~119 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3a8d418182ee825e9492d8b21c6fe40e06caf06a;p=GitHub%2FWoltLab%2FWCF.git Overhauled to top/inline editor buttons --- diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl index 80dd468a0f..1e158c81d1 100644 --- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl +++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl @@ -75,6 +75,7 @@ requirejs.config({ 'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}', 'wcf.global.pageDirection': '{lang}wcf.global.pageDirection{/lang}', 'wcf.global.reason': '{lang}wcf.global.reason{/lang}', + 'wcf.global.scrollUp': '{lang}wcf.global.scrollUp{/lang}', 'wcf.global.sidebar.hideLeftSidebar': '{lang}wcf.global.sidebar.hideLeftSidebar{/lang}', 'wcf.global.sidebar.hideRightSidebar': '{lang}wcf.global.sidebar.hideRightSidebar{/lang}', 'wcf.global.sidebar.showLeftSidebar': '{lang}wcf.global.sidebar.showLeftSidebar{/lang}', @@ -87,7 +88,6 @@ requirejs.config({ 'wcf.page.sitemap': '{lang}wcf.page.sitemap{/lang}', 'wcf.style.changeStyle': '{lang}wcf.style.changeStyle{/lang}', 'wcf.user.activityPoint': '{lang}wcf.user.activityPoint{/lang}', - 'wcf.style.changeStyle': '{lang}wcf.style.changeStyle{/lang}', 'wcf.user.panel.markAllAsRead': '{lang}wcf.user.panel.markAllAsRead{/lang}', 'wcf.user.panel.markAsRead': '{lang}wcf.user.panel.markAsRead{/lang}', 'wcf.user.panel.settings': '{lang}wcf.user.panel.settings{/lang}', diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index 1f2763acbf..5672aec6a1 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -1010,6 +1010,7 @@ WCF.Dropdown.Interactive.Handler = { if (this._dropdownContainer === null) { this._dropdownContainer = $('