Removed the confirmation box for marking items in the user panel as read

See #2628

diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index 0bb61596fc76afaddbdfa29dab860978a8a78e28..6223f1ad79bb335cf1837ddebb71428cbb904680 100644 (file)
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -88,7 +88,6 @@
                                                <script data-relocate="true">
                                                        $(function() {
                                                                new WCF.User.Panel.Notification({
-                                                                       markAllAsReadConfirmMessage: '{lang}wcf.user.notification.markAllAsConfirmed.confirmMessage{/lang}',
                                                                        noItems: '{lang}wcf.user.notification.noMoreNotifications{/lang}',
                                                                        settingsLink: '{link controller='NotificationSettings' encode=false}{/link}',
                                                                        showAllLink: '{link controller='NotificationList' encode=false}{/link}',
@@ -264,7 +263,6 @@
                                                                new WCF.User.Panel.Moderation({
                                                                        deletedContent: '{lang}wcf.moderation.showDeletedContent{/lang}',
                                                                        deletedContentLink: '{link controller='DeletedContentList' encode=false}{/link}',
-                                                                       markAllAsReadConfirmMessage: '{lang}wcf.moderation.markAllAsRead.confirmMessage{/lang}',
                                                                        noItems: '{lang}wcf.moderation.noMoreItems{/lang}',
                                                                        showAllLink: '{link controller='ModerationList' encode=false}{/link}',
                                                                        title: '{lang}wcf.moderation.moderation{/lang}'
@@ -283,4 +281,4 @@
                        <a href="#" id="userPanelSearchButton" class="jsTooltip" title="{lang}wcf.global.search{/lang}"><span class="icon icon32 fa-search"></span> <span>{lang}wcf.global.search{/lang}</span></a>
                </li>
        </ul>
-</nav>
\ No newline at end of file
+</nav>

diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index 1e5ad4934e1c30894bc468a57e473d5115da4a66..f1dc65d17d76f956b64cec877a0ae8d66a7e87b5 100644 (file)
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -284,16 +284,12 @@ if (COMPILER_TARGET_DEFAULT) {
                                
                                if (this._options.enableMarkAsRead) {
                                        var $outstandingItems = this._dropdown.getItemList().children('.interactiveDropdownItemOutstanding');
-                                       if (this._markAllAsReadLink === null && $outstandingItems.length && this._options.markAllAsReadConfirmMessage) {
+                                       if (this._markAllAsReadLink === null && $outstandingItems.length) {
                                                var $button = this._markAllAsReadLink = $('<li class="interactiveDropdownItemMarkAllAsRead"><a href="#" title="' + WCF.Language.get('wcf.user.panel.markAllAsRead') + '" class="jsTooltip"><span class="icon icon24 fa-check" /></a></li>').appendTo(this._dropdown.getLinkList());
                                                $button.click((function (event) {
                                                        this._dropdown.close();
                                                        
-                                                       WCF.System.Confirmation.show(this._options.markAllAsReadConfirmMessage, (function (action) {
-                                                               if (action === 'confirm') {
-                                                                       this._markAllAsRead();
-                                                               }
-                                                       }).bind(this));
+                                                       this._markAllAsRead();
                                                        
                                                        return false;
                                                }).bind(this));

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 8bcdefb5a39f5920e9fee2069edce0cb87b81b09..7a70d7b9ceefe3fd90912a055a7b69d97de46f1d 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3307,7 +3307,6 @@ E-Mail-Adresse: {@$emailAddress} {* this line ends with a space *}
                <item name="wcf.moderation.outstandingItems"><![CDATA[Ausstehende Einträge]]></item>
                <item name="wcf.moderation.doneItems"><![CDATA[Erledigte Einträge]]></item>
                <item name="wcf.moderation.lastChangeTime"><![CDATA[Letzte Änderung]]></item>
-               <item name="wcf.moderation.markAllAsRead.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} wirklich alle Einträge als gelesen markieren?]]></item>
                <item name="wcf.moderation.moderation"><![CDATA[Moderation]]></item>
                <item name="wcf.moderation.noMoreItems"><![CDATA[Keine weiteren Einträge]]></item>
                <item name="wcf.moderation.notification.comment.title"><![CDATA[Neuer Kommentar (Moderation)]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 7dfba4865d9a5ae5276a5ed7dbcbdd7d260e27e4..da79481f6f22e4bdb8fd6322c5a11448df087fc6 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3668,7 +3668,6 @@ Email: {@$emailAddress} {* this line ends with a space *}
                <item name="wcf.moderation.outstandingItems"><![CDATA[Pending Items]]></item>
                <item name="wcf.moderation.doneItems"><![CDATA[Resolved Items]]></item>
                <item name="wcf.moderation.lastChangeTime"><![CDATA[Last Change]]></item>
-               <item name="wcf.moderation.markAllAsRead.confirmMessage"><![CDATA[Do you really want to mark all entries as read?]]></item>
                <item name="wcf.moderation.moderation"><![CDATA[Moderation]]></item>
                <item name="wcf.moderation.noMoreItems"><![CDATA[You have no recent items.]]></item>
                <item name="wcf.moderation.notification.comment.title"><![CDATA[New comment (Moderation)]]></item>