Fixed loading overlay and added missing use
authorAlexander Ebert <ebert@woltlab.com>
Thu, 30 Aug 2012 13:05:49 +0000 (15:05 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 30 Aug 2012 13:05:49 +0000 (15:05 +0200)
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/lib/action/AbstractAction.class.php

index d1b067b80550c2bdf2c208f5372811efbd28add8..49694987a8da534b1c15d5ad00372f6e98a883ce 100755 (executable)
@@ -1355,8 +1355,9 @@ WCF.Action.Proxy.prototype = {
                        this.options.init(this);
                }
                
+               this._activeRequests++;
+               
                if (this.options.showLoadingOverlay) {
-                       this._activeRequests++;
                        this._showLoadingOverlay();
                }
        },
@@ -1459,10 +1460,8 @@ WCF.Action.Proxy.prototype = {
                if ($.isFunction(this.options.after)) {
                        this.options.after();
                }
-
-               if (this.options.showLoadingOverlay) {
-                       this._activeRequests--;
-               }
+               
+               this._activeRequests--;
                
                // disable DOMNodeInserted event
                WCF.DOMNodeInsertedHandler.disable();
index 715cf0def51bfd15984b8f74c69c35d2e65f19ee..3ae7b46bb6094955acd86db2fe7ba127248a3bf9 100644 (file)
@@ -2,6 +2,7 @@
 namespace wcf\action;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\IllegalLinkException;
+use wcf\system\exception\PermissionDeniedException;
 use wcf\system\WCF;
 
 /**