Merge pull request #1921 from vogdb/issue-1921

Pass context of caller to promiseThrottler.
cargomedia · Oct 8, 2015 · 4941286 · 4941286
2 parents 383c502 + 64a55fd
commit 4941286
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 41 deletions.
diff --git a/client-vendor/after-body/promise-throttler/promise-throttler.js b/client-vendor/after-body/promise-throttler/promise-throttler.js
@@ -53,14 +53,15 @@
       }
       if (options.queue && promise && promise.isPending()) {
         var args = arguments;
+        var self = this;
         promise = promise.then(function() {
-          return fn.apply(null, args);
+          return fn.apply(self, args);
         }).catch(function() {
-          return fn.apply(null, args);
+          return fn.apply(self, args);
         });
       }
       if (!promise || !promise.isPending()) {
-        promise = fn.apply(null, arguments);
+        promise = fn.apply(this, arguments);
       }
       return promise;
     };

diff --git a/library/CM/Layout/Abstract.js b/library/CM/Layout/Abstract.js
@@ -11,48 +11,42 @@ var CM_Layout_Abstract = CM_View_Abstract.extend({
   _$pagePlaceholder: null,
 
   /** @type PromiseThrottled|Null */
-  _loadPageThrottled: null,
+  _loadPageThrottled: promiseThrottler(function(path) {
+    var layout = this;
+    layout._chargeSpinnerTimeout();
+
+    return this.ajaxModal('loadPage', {path: path})
+      .then(function(response) {
+        layout._clearSpinnerTimeout();
+        if (response.redirectExternal) {
+          cm.router.route(response.redirectExternal);
+          return;
+        }
+        var view = layout._injectView(response);
+        var reload = (layout.getClass() != response.layoutClass);
+        if (reload) {
+          window.location.replace(response.url);
+          return;
+        }
+        layout._removePagePlaceholder(view.$el);
+        layout._updateHistory(path, response.url);
+        layout._onPageSetup(response.title, response.menuEntryHashList, response.jsTracking);
+        view._ready();
+        return view;
+      })
+      .catch(function(error) {
+        layout._clearSpinnerTimeout();
+        if (!(error instanceof Promise.CancellationError)) {
+          layout._errorPagePlaceholder(error);
+          layout._onPageError();
+          throw error;
+        }
+      });
+  }, {cancelLeading: true}),
 
   /** @type {Number} timeout ID */
   _timeoutLoading: null,
 
-  initialize: function() {
-    CM_View_Abstract.prototype.initialize.call(this);
-
-    var layout = this;
-    this._loadPageThrottled = promiseThrottler(function(path) {
-      layout._chargeSpinnerTimeout();
-
-      return layout.ajaxModal('loadPage', {path: path})
-        .then(function(response) {
-          layout._clearSpinnerTimeout();
-          if (response.redirectExternal) {
-            cm.router.route(response.redirectExternal);
-            return;
-          }
-          var view = layout._injectView(response);
-          var reload = (layout.getClass() != response.layoutClass);
-          if (reload) {
-            window.location.replace(response.url);
-            return;
-          }
-          layout._removePagePlaceholder(view.$el);
-          layout._updateHistory(path, response.url);
-          layout._onPageSetup(response.title, response.menuEntryHashList, response.jsTracking);
-          view._ready();
-          return view;
-        })
-        .catch(function(error) {
-          layout._clearSpinnerTimeout();
-          if (!(error instanceof Promise.CancellationError)) {
-            layout._errorPagePlaceholder(error);
-            layout._onPageError();
-            throw error;
-          }
-        });
-    }, {cancelLeading: true});
-  },
-
   /**
    * @returns {CM_View_Abstract|null}
    */