From: Tim Düsterhus Date: Wed, 1 Jun 2016 16:10:06 +0000 (+0200) Subject: Merge branch 'patch-17' of https://github.com/Fabii547/WCF into Fabii547-patch-17 X-Git-Tag: 3.0.0_Beta_1~1548^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f67cf808cf76a2d901c5acad5af6b246fd37ed27;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'patch-17' of https://github.com/Fabii547/WCF into Fabii547-patch-17 --- f67cf808cf76a2d901c5acad5af6b246fd37ed27 diff --cc wcfsetup/install/files/js/WoltLab/WCF/Ui/Message/InlineEditor.js index c25c0b5627,79bc1d12d3..63ee5681d5 --- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Message/InlineEditor.js +++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Message/InlineEditor.js @@@ -338,10 -340,15 +338,10 @@@ define var formSubmit = elBySel('.formSubmit', editor); var buttonSave = elBySel('button[data-type="save"]', formSubmit); - buttonSave.addEventListener('click', this._save.bind(this)); + buttonSave.addEventListener(WCF_CLICK_EVENT, this._save.bind(this)); - if (this._options.extendedForm) { - var buttonExtended = elBySel('button[data-type="extended"]', formSubmit); - buttonExtended.addEventListener(WCF_CLICK_EVENT, this._prepareExtended.bind(this)); - } - var buttonCancel = elBySel('button[data-type="cancel"]', formSubmit); - buttonCancel.addEventListener('click', this._restoreMessage.bind(this)); + buttonCancel.addEventListener(WCF_CLICK_EVENT, this._restoreMessage.bind(this)); EventHandler.add('com.woltlab.wcf.redactor', 'submitEditor_' + id, (function(data) { data.cancel = true;