From: Magnus Kühn <magnus.khn@gmail.com>
Date: Sat, 20 Apr 2013 07:40:40 +0000 (+0200)
Subject: Using WCF.Action.Proxy.abortPrevious() in WCF.ACP.Worker
X-Git-Tag: 2.0.0_Beta_1~32^2^2~2^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=131a201b2edcda415d66831c461ba87a7db361a5;p=GitHub%2FWoltLab%2FWCF.git

Using WCF.Action.Proxy.abortPrevious() in WCF.ACP.Worker
---

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index a181546983..8d40183648 100644
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -1126,12 +1126,6 @@ WCF.ACP.Options.Group = Class.extend({
  * @param	object		options
  */
 WCF.ACP.Worker = Class.extend({
-	/**
-	 * true, if worker was aborted
-	 * @var	boolean
-	 */
-	_aborted: false,
-	
 	/**
 	 * dialog id
 	 * @var	string
@@ -1165,7 +1159,6 @@ WCF.ACP.Worker = Class.extend({
 	 * @param	object		parameters
 	 */
 	init: function(dialogID, className, title, parameters) {
-		this._aborted = false;
 		this._dialogID = dialogID + 'Worker';
 		this._dialog = null;
 		this._proxy = new WCF.Action.Proxy({
@@ -1187,15 +1180,13 @@ WCF.ACP.Worker = Class.extend({
 	 * @param	object		data
 	 */
 	_success: function(data) {
-		if (this._aborted) {
-			return;
-		}
-		
 		// init binding
 		if (this._dialog === null) {
 			this._dialog = $('<div id="' + this._dialogID + '" />').hide().appendTo(document.body);
 			this._dialog.wcfDialog({
-				onClose:  $.proxy(function() { this._aborted = true; }, this),
+				onClose:  $.proxy(function() {
+					this._proxy.abortPrevious();
+				}, this),
 				title: this._title
 			});
 		}