From 9d118fa4c035827b399acdcb4c6c05ad1be5f3c5 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sun, 31 Jan 2016 13:46:41 +0100 Subject: [PATCH] Replaced WCF.M;essage.QuickReply --- wcfsetup/install/files/js/WCF.Assets.js | 4 +- wcfsetup/install/files/js/WCF.Message.js | 502 +----------------- .../install/files/js/WoltLab/WCF/Dom/Util.js | 88 ++- .../files/js/WoltLab/WCF/Event/Handler.js | 4 +- .../files/js/WoltLab/WCF/Ui/Message/Reply.js | 276 ++++++++++ .../install/files/js/WoltLab/WCF/Ui/Scroll.js | 84 +++ wcfsetup/install/files/js/wcf.globalHelper.js | 9 + wcfsetup/install/files/style/ui/message.scss | 20 + 8 files changed, 486 insertions(+), 501 deletions(-) create mode 100644 wcfsetup/install/files/js/WoltLab/WCF/Ui/Message/Reply.js create mode 100644 wcfsetup/install/files/js/WoltLab/WCF/Ui/Scroll.js diff --git a/wcfsetup/install/files/js/WCF.Assets.js b/wcfsetup/install/files/js/WCF.Assets.js index 145db8d8bf..04f5e47544 100644 --- a/wcfsetup/install/files/js/WCF.Assets.js +++ b/wcfsetup/install/files/js/WCF.Assets.js @@ -53,5 +53,7 @@ * Copyright 2013, Dustan Kasten * Released under the MIT license. * https://github.com/iamdustan/smoothscroll/blob/master/LICENSE + * + * Version below includes the fix of PR */ -!function(e,t,r){"use strict";function n(){return e.performance!==r&&e.performance.now!==r?e.performance.now():Date.now()}function o(e){return.5*(1-Math.cos(Math.PI*e))}function a(e){if("object"!=typeof e||e.behavior===r||"auto"===e.behavior||"instant"===e.behavior)return!0;if("smooth"===e.behavior)return!1;throw new TypeError(e.behavior+" is not a valid value for enumeration ScrollBehavior")}function l(e,t,r){e.scrollTop=r,e.scrollLeft=t}function i(e){return e.clientHeight1?1:d,u=o(d),p=l+(t-l)*u,g=i+(r-i)*u,m(p,g),p===t&&g===r?(l=i=s=null,void e.cancelAnimationFrame(c)):void(c=e.requestAnimationFrame(a))}var l=e.scrollX||e.pageXOffset,i=e.scrollY||e.pageYOffset,s=n();c&&e.cancelAnimationFrame(c),c=e.requestAnimationFrame(a)}function u(t,r){function a(){var r,g,v,d=n(),h=(d-p)/f;return h=h>1?1:h,r=o(h),g=i+(u-i)*r,v=s+(m-s)*r,l(t,g,v),g===u&&v===m?(i=s=p=null,void e.cancelAnimationFrame(c)):void(c=e.requestAnimationFrame(a))}var i=t.scrollLeft,s=t.scrollTop,u=r.left,m=r.top,p=n();c&&e.cancelAnimationFrame(c),c=e.requestAnimationFrame(a)}if(!("scrollBehavior"in t.documentElement.style)){var c,f=768,m=e.scrollTo,p=e.scrollBy,g=e.Element.prototype.scrollIntoView;e.scroll=e.scrollTo=function(){return a(arguments[0])?m.call(e,arguments[0].left||arguments[0],arguments[0].top||arguments[1]):s.call(e,~~arguments[0].left,~~arguments[0].top)},e.scrollBy=function(){if(a(arguments[0]))return p.call(e,arguments[0].left||arguments[0],arguments[0].top||arguments[1]);var t=e.scrollX||e.pageXOffset,r=e.scrollY||e.pageYOffset;return s(~~arguments[0].left+t,~~arguments[0].top+r)},Element.prototype.scrollIntoView=function(){var t,r,n,o,l,s;return a(arguments[0])?g.call(this,arguments[0]||!0):(l=i(this),l&&(s=e.getComputedStyle(l,null),r=parseInt(s.getPropertyValue("padding-left"),10),n=parseInt(s.getPropertyValue("padding-top"),10),t={top:this.offsetTop-2*n,left:this.offsetLeft-2*r},o=u(l,t)),o)}}}(window,document); +!function(e,t,r){"use strict";function n(){return e.performance!==r&&e.performance.now!==r?e.performance.now():Date.now()}function o(e){return.5*(1-Math.cos(Math.PI*e))}function a(e){if("object"!=typeof e||e.behavior===r||"auto"===e.behavior||"instant"===e.behavior)return!0;if("smooth"===e.behavior)return!1;throw new TypeError(e.behavior+" is not a valid value for enumeration ScrollBehavior")}function l(e,t,r){e.scrollTop=r,e.scrollLeft=t}function i(t,a){function l(){var p,g,v,h=n(),d=(h-m)/c;return d=d>1?1:d,p=o(d),g=i+(t-i)*p,v=u+(a-u)*p,f(g,v),g===t&&v===a?(i=u=m=null,e.cancelAnimationFrame(s),r):(s=e.requestAnimationFrame(l),r)}var i=e.scrollX||e.pageXOffset,u=e.scrollY||e.pageYOffset,m=n();s&&e.cancelAnimationFrame(s),s=e.requestAnimationFrame(l)}function u(a,u){function f(){var t,i,u,d=n(),y=(d-h)/c;return y=y>1?1:y,t=o(y),i=m+(g-m)*t,u=p+(v-p)*t,l(a,i,u),i===g&&u===v?(m=p=h=null,e.cancelAnimationFrame(s),r):(s=e.requestAnimationFrame(f),r)}if(a===t.documentElement||a===t.body)return i(u.left,u.top),r;var m=a.scrollLeft,p=a.scrollTop,g=u.left,v=u.top,h=n();s&&e.cancelAnimationFrame(s),s=e.requestAnimationFrame(f)}if(!("scrollBehavior"in t.documentElement.style)){var s,c=768,f=e.scrollTo,m=e.scrollBy,p=e.Element.prototype.scrollIntoView;e.scroll=e.scrollTo=function(){return a(arguments[0])?f.call(e,arguments[0].left||arguments[0],arguments[0].top||arguments[1]):i.call(e,~~arguments[0].left,~~arguments[0].top)},e.scrollBy=function(){if(a(arguments[0]))return m.call(e,arguments[0].left||arguments[0],arguments[0].top||arguments[1]);var t=e.scrollX||e.pageXOffset,r=e.scrollY||e.pageYOffset;return i(~~arguments[0].left+t,~~arguments[0].top+r)},Element.prototype.scrollIntoView=function(){var r,n,o,l;return a(arguments[0])?p.call(this,arguments[0]||!0):(l=e.getComputedStyle(t.body,null),n=parseInt(l.getPropertyValue("padding-left"),10),o=parseInt(l.getPropertyValue("padding-top"),10),r={top:this.offsetTop-2*o,left:this.offsetLeft-2*n},u(t.body,r))}}}(window,document); diff --git a/wcfsetup/install/files/js/WCF.Message.js b/wcfsetup/install/files/js/WCF.Message.js index 0ed109243d..33eb3e8bb6 100644 --- a/wcfsetup/install/files/js/WCF.Message.js +++ b/wcfsetup/install/files/js/WCF.Message.js @@ -310,8 +310,8 @@ WCF.Message.Preview = Class.extend({ // validate message field this._messageFieldID = $.wcfEscapeID(messageFieldID); - this._messageField = $('#' + this._messageFieldID); - if (!this._messageField.length) { + this._textarea = $('#' + this._messageFieldID); + if (!this._textarea.length) { console.debug("[WCF.Message.Preview] Unable to find message field identified by '" + this._messageFieldID + "'"); return; } @@ -389,10 +389,10 @@ WCF.Message.Preview = Class.extend({ */ _getMessage: function() { if (!$.browser.redactor) { - return $.trim(this._messageField.val()); + return $.trim(this._textarea.val()); } - else if (this._messageField.data('redactor')) { - return this._messageField.redactor('wutil.getText'); + else if (this._textarea.data('redactor')) { + return this._textarea.redactor('wutil.getText'); } return null; @@ -410,7 +410,7 @@ WCF.Message.Preview = Class.extend({ this._previewButton.html(this._previewButtonLabel).enable(); // remove error message - this._messageField.parent().children('small.innerError').remove(); + this._textarea.parent().children('small.innerError').remove(); // evaluate message this._handleResponse(data); @@ -439,9 +439,9 @@ WCF.Message.Preview = Class.extend({ // restore preview button this._previewButton.html(this._previewButtonLabel).enable(); - var $innerError = this._messageField.next('small.innerError').empty(); + var $innerError = this._textarea.next('small.innerError').empty(); if (!$innerError.length) { - $innerError = $('').appendTo(this._messageField.parent()); + $innerError = $('').appendTo(this._textarea.parent()); } $innerError.html(data.returnValues.errorType); @@ -722,492 +722,6 @@ WCF.Message.Smilies = Class.extend({ } }); -/** - * Provides an AJAX-based quick reply for messages. - */ -WCF.Message.QuickReply = Class.extend({ - /** - * quick reply container - * @var jQuery - */ - _container: null, - - /** - * message field - * @var jQuery - */ - _messageField: null, - - /** - * notification object - * @var WCF.System.Notification - */ - _notification: null, - - /** - * true, if a request to save the message is pending - * @var boolean - */ - _pendingSave: false, - - /** - * action proxy - * @var WCF.Action.Proxy - */ - _proxy: null, - - /** - * collection of quick reply buttons - * @var jQuery - */ - _quickReplyButtons: null, - - /** - * quote manager object - * @var WCF.Message.Quote.Manager - */ - _quoteManager: null, - - /** - * scroll handler - * @var WCF.Effect.Scroll - */ - _scrollHandler: null, - - /** - * success message for created but invisible messages - * @var string - */ - _successMessageNonVisible: '', - - /** - * Initializes a new WCF.Message.QuickReply object. - * - * @param boolean supportExtendedForm - * @param WCF.Message.Quote.Manager quoteManager - */ - init: function(supportExtendedForm, quoteManager) { - this._container = $('#messageQuickReply'); - this._container.children('.message').addClass('jsInvalidQuoteTarget'); - this._messageField = $('#text'); - this._pendingSave = false; - if (!this._container || !this._messageField) { - return; - } - - // button actions - var $formSubmit = this._container.find('.formSubmit'); - var $saveButton = $formSubmit.find('button[data-type=save]').removeAttr('accesskey').click($.proxy(this._save, this)); - if (supportExtendedForm) $formSubmit.find('button[data-type=extended]').click($.proxy(this._prepareExtended, this)); - $formSubmit.find('button[data-type=cancel]').click($.proxy(this._cancel, this)); - - if (quoteManager) this._quoteManager = quoteManager; - - this._quickReplyButtons = $('.jsQuickReply').data('__api', this).click($.proxy(this.click, this)); - - this._proxy = new WCF.Action.Proxy({ - failure: $.proxy(this._failure, this), - showLoadingOverlay: false, - success: $.proxy(this._success, this) - }); - this._scroll = new WCF.Effect.Scroll(); - this._notification = new WCF.System.Notification(WCF.Language.get('wcf.global.success.add')); - this._successMessageNonVisible = ''; - - WCF.System.Event.addListener('com.woltlab.wcf.redactor', 'submitEditor_text', function(data) { - data.cancel = true; - - $saveButton.trigger('click'); - }); - }, - - /** - * Handles clicks on reply button. - * - * @param object event - */ - click: function(event) { - this._container.toggle(); - - if (this._container.is(':visible')) { - this._quickReplyButtons.each(function() { - var $button = $(this); - if ($button.parent()[0].tagName === 'LI') { - $button.parent().hide(); - } - else { - $button.hide(); - } - }); - - setTimeout((function() { - $(document).trigger('resize'); - if (!$.browser.mobile || !$.browser.chrome) { - // Chrome on Android scrolls to the caret position, manually scrolling breaks the position - this._scroll.scrollTo(this._container, true); - } - }).bind(this), 100); - - WCF.Message.Submit.registerButton('text', this._container.find('.formSubmit button[data-type=save]')); - - if (this._quoteManager) { - // check if message field is empty - var $empty = true; - if ($.browser.redactor) { - if (this._messageField.data('redactor')) { - this._editorCallback(this._messageField.redactor('wutil.isEmptyEditor')); - } - } - else { - $empty = (!this._messageField.val().length); - this._editorCallback($empty); - } - } - } - - // discard event - if (event !== null) { - event.stopPropagation(); - return false; - } - }, - - /** - * Inserts quotes and focuses the editor. - */ - _editorCallback: function(isEmpty) { - if (isEmpty) { - this._quoteManager.insertQuotes(this._getClassName(), this._getObjectID(), $.proxy(this._insertQuotes, this)); - } - - if ($.browser.redactor) { - this._messageField.redactor('wutil.selectionEndOfEditor'); - } - else { - this._messageField.focus(); - } - }, - - /** - * Returns container element. - * - * @return jQuery - */ - getContainer: function() { - return this._container; - }, - - /** - * Insertes quotes into the quick reply editor. - * - * @param object data - */ - _insertQuotes: function(data) { - if (!data.returnValues.template) { - return; - } - - if ($.browser.redactor) { - var $html = WCF.String.unescapeHTML(data.returnValues.template); - $html = this._messageField.redactor('wbbcode.convertToHtml', $html); - $html = $html.replace(/

<\/p>/, 'blockquote>'); - - this._messageField.redactor('focus.setEnd'); - this._messageField.redactor('wutil.insertDynamic', $html, data.returnValues.template); - this._messageField.redactor('wutil.selectionEndOfEditor'); - this._messageField.redactor('wbbcode.observeQuotes'); - } - else { - this._messageField.val(data.returnValues.template); - } - }, - - /** - * Saves message. - */ - _save: function() { - if (this._pendingSave) { - return; - } - - var $message = ''; - if ($.browser.redactor) { - $message = this._messageField.redactor('wutil.getText'); - } - else { - $message = $.trim(this._messageField.val()); - } - - // check if message is empty - var $innerError = this._messageField.parent().find('small.innerError'); - if ($message === '' || $message === '0') { - if (!$innerError.length) { - $innerError = $('').appendTo(this._messageField.parent()); - } - - $innerError.html(WCF.Language.get('wcf.global.form.error.empty')); - return; - } - else { - $innerError.remove(); - } - - this._pendingSave = true; - - this._proxy.setOption('data', { - actionName: 'quickReply', - className: this._getClassName(), - interfaceName: 'wcf\\data\\IMessageQuickReplyAction', - parameters: this._getParameters($message) - }); - this._proxy.sendRequest(); - - // show spinner and hide Redactor - var $messageBody = this._container.find('.messageQuickReplyContent .messageBody'); - $('