Delete confirmation now uses system confirmation

Added ability to pass custom parameters to callback

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index fd6f6bd26e819ba17a5290861517329af7de08c3..18bfb29a7b3850a6c0ac78a6ccfb6954edc90a72 100644 (file)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -1280,16 +1280,27 @@ WCF.Action.Delete.prototype = {
                var $target = $(event.target);
                
                if ($target.data('confirmMessage')) {
-                       if (confirm($target.data('confirmMessage'))) {
-                               this.proxy.showSpinner($target);
-                               this._sendRequest($target);
-                       }
+                       WCF.System.Confirmation.show($target.data('confirmMessage'), $.proxy(this._execute, this), { target: $target });
                }
                else {
                        this.proxy.showSpinner($target);
                        this._sendRequest($target);
                }
+       },
+       
+       /**
+        * Executes deletion.
+        * 
+        * @param       string          action
+        * @param       object          parameters
+        */
+       _execute: function(action, parameters) {
+               if (action === 'cancel') {
+                       return;
+               }
                
+               this.proxy.showSpinner(parameters.target);
+               this._sendRequest(parameters.target);
        },
        
        _sendRequest: function(object) {
@@ -3547,6 +3558,12 @@ WCF.System.Confirmation = {
         */
        _dialog: null,
        
+       /**
+        * callback parameters
+        * @var object
+        */
+       _parameters: null,
+       
        /**
         * dialog visibility
         * @var boolean
@@ -3558,8 +3575,9 @@ WCF.System.Confirmation = {
         * 
         * @param       string          message
         * @param       object          callback
+        * @param       object          parameters
         */
-       show: function(message, callback) {
+       show: function(message, callback, parameters) {
                if (this._visible) {
                        console.debug('[WCF.System.Confirmation] Confirmation dialog is already open, refusing action.');
                        return;
@@ -3571,6 +3589,7 @@ WCF.System.Confirmation = {
                }
                
                this._callback = callback;
+               this._parameters = parameters;
                if (this._dialog === null) {
                        this._createDialog();
                }
@@ -3623,7 +3642,7 @@ WCF.System.Confirmation = {
                this._visible = false;
                this._dialog.wcfDialog('close');
                
-               this._callback(action);
+               this._callback(action, this._parameters);
        },
        
        /**