up.js in upjs-rails-0.10.5

- old
+ new

@@ -2034,11 +2034,11 @@
 
 (function() {
   var slice = [].slice;
 
   up.layout = (function() {
-    var SCROLL_PROMISE_KEY, config, finishScrolling, lastScrollTops, measureObstruction, reset, restoreScroll, reveal, saveScroll, scroll, scrollTops, u, viewportOf, viewportSelector, viewports, viewportsIn;
+    var SCROLL_PROMISE_KEY, config, finishScrolling, lastScrollTops, measureObstruction, reset, restoreScroll, reveal, saveScroll, scroll, scrollTops, u, viewportOf, viewportSelector, viewports, viewportsWithin;
     u = up.util;
 
     /**
     Configures the application layout.
     
@@ -2311,15 +2311,15 @@
     /**
     Returns a jQuery collection of all the viewports contained within the
     given selector or element.
     
     @protected
-    @method up.layout.viewportsIn
+    @method up.layout.viewportsWithin
     @param {String|Element|jQuery} selectorOrElement
     @return jQuery
      */
-    viewportsIn = function(selectorOrElement) {
+    viewportsWithin = function(selectorOrElement) {
       var $element;
       $element = $(selectorOrElement);
       return viewportSelector().findWithSelf($element);
     };
 
@@ -2400,11 +2400,11 @@
       if (options == null) {
         options = {};
       }
       $viewports = void 0;
       if (options.around) {
-        $descendantViewports = viewportsIn(options.around);
+        $descendantViewports = viewportsWithin(options.around);
         $ancestorViewports = viewportOf(options.around);
         $viewports = $ancestorViewports.add($descendantViewports);
       } else {
         $viewports = viewports();
       }
@@ -2505,11 +2505,11 @@
       reveal: reveal,
       scroll: scroll,
       finishScrolling: finishScrolling,
       defaults: config.update,
       viewportOf: viewportOf,
-      viewportsIn: viewportsIn,
+      viewportsWithin: viewportsWithin,
       viewports: viewports,
       scrollTops: scrollTops,
       saveScroll: saveScroll,
       restoreScroll: restoreScroll
     };
@@ -3715,11 +3715,11 @@
         promise = load(request);
         set(request, promise);
       }
       if (pending && !options.preload) {
         loadStarted();
-        promise.then(loadEnded);
+        promise.always(loadEnded);
       }
       return promise;
     };
     SAFE_HTTP_METHODS = ['GET', 'OPTIONS', 'HEAD'];
 
@@ -3777,10 +3777,10 @@
     };
     load = function(request) {
       var promise;
       up.bus.emit('proxy:load', request);
       promise = u.ajax(request);
-      promise.then(function() {
+      promise.always(function() {
         return up.bus.emit('proxy:receive', request);
       });
       return promise;
     };
     isIdempotent = function(request) {