unpoly-rails 3.10.0.rc1 → 3.10.2

data/assets/unpoly/unpoly.js

@@ -5,7 +5,7 @@
 /***/ (() => {
 
 window.up = {
-    version: '3.10.0-rc1'
+    version: '3.10.2'
 };
 
 
@@ -637,8 +637,8 @@ up.util = (function () {
             });
         }
     }
-    function delegatePromise(object, promiseProp) {
-        return defineDelegates(object, ['then', 'catch', 'finally'], function () { return this[promiseProp]; });
+    function delegatePromise(object, targetProvider) {
+        return defineDelegates(object, ['then', 'catch', 'finally'], targetProvider);
     }
     function stringifyArg(arg, placeholder = '%o') {
         let string;
@@ -2212,18 +2212,16 @@ up.RenderJob = (_a = class RenderJob {
             }
         }
         _getChange() {
-            if (this.options.url) {
-                let onRequestProcessed = (request) => this._handleAbortOption(request);
-                return new up.Change.FromURL({ ...this.options, onRequestProcessed });
+            let handleAbort = u.memoize((request) => this._handleAbortOption(request));
+            let renderOptions = { ...this.options, handleAbort };
+            if (renderOptions.url) {
+                return new up.Change.FromURL(renderOptions);
+            }
+            else if (renderOptions.response) {
+                return new up.Change.FromResponse(renderOptions);
             }
             else {
-                let onRender = () => this._handleAbortOption(null);
-                if (this.options.response) {
-                    return new up.Change.FromResponse({ ...this.options, onRender });
-                }
-                else {
-                    return new up.Change.FromContent({ ...this.options, onRender });
-                }
+                return new up.Change.FromContent(renderOptions);
             }
         }
         _emitGuardEvent() {
@@ -2264,7 +2262,7 @@ up.RenderJob = (_a = class RenderJob {
         }
     },
     (() => {
-        u.delegatePromise(_a.prototype, '_rendered');
+        u.delegatePromise(_a.prototype, function () { return this._rendered; });
         u.memoizeMethod(_a.prototype, {
             _awaitFinished: true,
             _getChange: true,
@@ -2855,9 +2853,8 @@ up.Change.CloseLayer = class CloseLayer extends up.Change {
         this._history = options.history ?? true;
     }
     execute() {
-        if (!this._layer.isOpen()) {
-            return Promise.resolve();
-        }
+        if (!this._layer.isOpen())
+            return;
         up.browser.assertConfirmed(this.options);
         if (this._emitCloseEvent().defaultPrevented && this._preventable) {
             throw new up.Aborted('Close event was prevented');
@@ -2906,10 +2903,13 @@ up.Change.CloseLayer = class CloseLayer extends up.Change {
         });
     }
     _handleFocus(formerParent) {
+        let hadFocus = this._layer.hasFocus();
         this._layer.overlayFocus.teardown();
         formerParent.overlayFocus?.moveToFront();
-        let newFocusElement = this._layer.origin || formerParent.element;
-        up.focus(newFocusElement, { preventScroll: true });
+        if (hadFocus) {
+            let newFocusElement = this._layer.origin || formerParent.element;
+            up.focus(newFocusElement, { preventScroll: true });
+        }
     }
 };
 
@@ -2928,16 +2928,13 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
                 up.network.loadPage(this.options);
                 return u.unresolvablePromise();
             }
-            this.request = up.request(this._getRequestAttrs());
-            if (this.options.preload) {
-                return this.request;
-            }
-            this._onRequestProcessed();
-            return await u.always(this.request, responseOrError => this._onRequestSettled(responseOrError));
-        }
-        _onRequestProcessed() {
-            this.options.onRequestProcessed?.(this.request);
-            this.request.runPreviews(this.options);
+            let request = this.request = up.request(this._getRequestAttrs());
+            this.options.onRequestKnown?.(request);
+            if (this.options.preload)
+                return request;
+            this.options.handleAbort?.(request);
+            request.runPreviews(this.options);
+            return await u.always(request, responseOrError => this._onRequestSettled(responseOrError));
         }
         _newPageReason() {
             if (u.isCrossOrigin(this.options.url)) {
@@ -2954,7 +2951,6 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
                 ...this.options,
                 ...successAttrs,
                 ...u.withRenamedKeys(failAttrs, up.fragment.failKey),
-                onProcessed: this._onRequestProcessed.bind(this),
             };
         }
         getPreflightProps() {
@@ -3203,7 +3199,7 @@ up.Change.FromContent = (_a = class FromContent extends up.Change {
             if (assets) {
                 up.script.assertAssetsOK(assets, plan.options);
             }
-            this.options.onRender?.();
+            this.options.handleAbort?.(null);
         }
         _getResponseDoc() {
             if (this._preflight)
@@ -4105,15 +4101,21 @@ up.FormValidator = class FormValidator {
 /***/ (() => {
 
 up.FocusCapsule = class FocusCapsule {
-    constructor(element, target, cursorProps) {
+    constructor(element, target) {
         this._element = element;
         this._target = target;
-        this._cursorProps = cursorProps;
+        this._cursorProps = up.viewport.copyCursorProps(this._element);
     }
     wasLost() {
-        return document.activeElement !== this._element;
+        return document.activeElement !== this._element && !this._voided;
+    }
+    autoVoid() {
+        up.on('focusin', { once: true }, () => this._voided = true);
     }
     restore(layer, focusOptions) {
+        if (!this.wasLost()) {
+            return false;
+        }
         let rediscoveredElement = up.fragment.get(this._target, { layer });
         if (rediscoveredElement) {
             up.viewport.copyCursorProps(this._cursorProps, rediscoveredElement);
@@ -4128,8 +4130,7 @@ up.FocusCapsule = class FocusCapsule {
         let target = up.fragment.tryToTarget(focusedElement);
         if (!target)
             return;
-        const cursorProps = up.viewport.copyCursorProps(focusedElement);
-        return new this(focusedElement, target, cursorProps);
+        return new this(focusedElement, target);
     }
 };
 
@@ -4302,9 +4303,7 @@ up.FragmentFocus = class FragmentFocus extends up.FragmentProcessor {
         return this._focusElement(match);
     }
     _restoreLostFocus() {
-        if (this._wasFocusLost()) {
-            return this.focusCapsule?.restore(this.layer, PREVENT_SCROLL_OPTIONS);
-        }
+        return this.focusCapsule?.restore(this.layer, PREVENT_SCROLL_OPTIONS);
     }
     _restorePreviousFocusForLocation() {
         return up.viewport.restoreFocus({ layer: this.layer });
@@ -5534,12 +5533,13 @@ up.LinkFollowIntent = class LinkFollowIntent {
     constructor(link, callback) {
         this._link = link;
         this._callback = callback;
+        this._lastRequest = null;
         this._on('mouseenter mousedown touchstart', (event) => this._scheduleCallback(event));
         this._on('mouseleave', () => this._unscheduleCallback());
         up.fragment.onAborted(this._link, () => this._unscheduleCallback());
     }
-    _on(eventType, callback) {
-        up.on(this._link, eventType, { passive: true }, callback);
+    _on(eventType, fn) {
+        up.on(this._link, eventType, { passive: true }, fn);
     }
     _scheduleCallback(event) {
         if (!up.link.shouldFollowEvent(event, this._link))
@@ -5556,14 +5556,16 @@ up.LinkFollowIntent = class LinkFollowIntent {
     }
     _unscheduleCallback() {
         clearTimeout(this._timer);
-        up.network.abort((request) => (request.origin === this._link) && request.background);
+        if (this._lastRequest?.background)
+            this._lastRequest.abort();
+        this._lastRequest = null;
     }
     _parseDelay() {
         return e.numberAttr(this._link, 'up-preload-delay') ?? up.link.config.preloadDelay;
     }
     _runCallback(event) {
         up.log.putsEvent(event);
-        up.error.muteUncriticalRejection(this._callback());
+        this._callback({ onRequestKnown: (request) => this._lastRequest = request });
     }
 };
 
@@ -5680,17 +5682,15 @@ up.NonceableCallback = class NonceableCallback {
         return new this(match[3], match[2]);
     }
     toFunction(...argNames) {
-        let scriptExpression = this.script;
-        if (!/\b(;|return|throw)\b/.test(scriptExpression))
-            scriptExpression = `return ${scriptExpression}`;
+        let script = this.script;
         if (this.nonce) {
             let callbackThis = this;
             return function (...args) {
-                return callbackThis._runAsNoncedFunction(scriptExpression, this, argNames, args);
+                return callbackThis._runAsNoncedFunction(script, this, argNames, args);
             };
         }
         else {
-            return new Function(...argNames, scriptExpression);
+            return new Function(...argNames, script);
         }
     }
     toString() {
@@ -6811,7 +6811,7 @@ up.Request = (_a = class Request extends up.Record {
         }
     },
     (() => {
-        u.delegatePromise(_a.prototype, '_deferred');
+        u.delegatePromise(_a.prototype, function () { return this._deferred; });
     })(),
     _a);
 
@@ -6959,14 +6959,14 @@ up.Request.Cache = class Cache {
     _isUsable(request) {
         return request.age < up.network.config.cacheEvictAge;
     }
-    get _size() {
+    get currentSize() {
         return this._requests.length;
     }
     get _capacity() {
         return up.network.config.cacheSize;
     }
     _limitSize() {
-        for (let i = 0; i < (this._size - this._capacity); i++) {
+        for (let i = 0; i < (this.currentSize - this._capacity); i++) {
             this._delete(this._requests[0]);
         }
     }
@@ -8059,7 +8059,10 @@ up.protocol = (function () {
         return u.normalizeMethod(up.browser.popCookie('_up_method'));
     });
     function locationFromXHR(xhr) {
-        return extractHeader(xhr, 'location') || xhr.responseURL;
+        let location = extractHeader(xhr, 'location') || xhr.responseURL;
+        if (location) {
+            return u.normalizeURL(location);
+        }
     }
     const config = new up.Config(() => ({
         methodParam: '_method',
@@ -8234,7 +8237,6 @@ up.script = (function () {
             'up-on-finished',
             'up-on-error',
             'up-on-offline',
-            'up-placeholder',
         ],
         scriptSelectors: [
             'script:not([type])',
@@ -9004,7 +9006,7 @@ up.fragment = (function () {
                 continue;
             let placement = defaultPlacement;
             let maybe = defaultMaybe;
-            selector = selector.replace(/\b::?(before|after)\b/, (_match, customPlacement) => {
+            selector = selector.replace(/\b::?(before|after|content)\b/, (_match, customPlacement) => {
                 placement = customPlacement;
                 return '';
             });
@@ -9468,7 +9470,7 @@ up.viewport = (function () {
     function firstHashTarget(hash, options = {}) {
         if (hash = pureHash(hash)) {
             const selector = [
-                e.attrSelector('id', hash),
+                e.idSelector(hash),
                 'a' + e.attrSelector('name', hash)
             ].join();
             return f.get(selector, options);
@@ -10488,7 +10490,7 @@ up.link = (function () {
         return follow(link, forcedOptions, { defaults });
     }
     up.attribute('up-defer', { defaultValue: 'insert' }, function (link, condition) {
-        let doLoad = () => up.error.muteUncriticalRejection(loadDeferred(link));
+        let doLoad = (options) => up.error.muteUncriticalRejection(loadDeferred(link, options));
         onLoadCondition(condition, link, doLoad);
     });
     up.on('up:click', config.selectorFn('followSelectors'), function (event, link) {
@@ -10511,7 +10513,7 @@ up.link = (function () {
     });
     up.compiler(config.selectorFn('preloadSelectors'), function (link) {
         if (!isPreloadDisabled(link)) {
-            let doPreload = () => up.error.muteUncriticalRejection(preload(link));
+            let doPreload = (options) => up.error.muteUncriticalRejection(preload(link, options));
             let condition = e.booleanOrStringAttr(link, 'up-preload');
             if (condition === true || u.isUndefined(condition))
                 condition = 'hover';
@@ -10650,16 +10652,10 @@ up.form = (function () {
         else {
             control.disabled = true;
         }
-        return () => {
-            control.disabled = false;
-            if (focusFallback && document.activeElement === focusFallback && control.isConnected) {
-                up.focus(control, { preventScroll: true });
-            }
-        };
+        return () => { control.disabled = false; };
     }
     function getDisableContainers(disable, origin) {
-        let givenOrigin = () => origin || up.fail('Missing { origin }');
-        let originScope = () => getScope(givenOrigin());
+        let originScope = () => getScope(origin);
         if (disable === true) {
             return [originScope()];
         }
@@ -10848,8 +10844,13 @@ up.form = (function () {
         const element = up.fragment.get(elementOrSelector, options);
         return element.form || element.closest('form');
     }
-    function getScope(element, options) {
-        return getForm(element, options) || up.layer.get(element).element;
+    function getScope(origin, options) {
+        if (origin) {
+            return getForm(origin, options) || up.layer.get(origin).element;
+        }
+        else {
+            return up.layer.current.element;
+        }
     }
     function focusedField() {
         return u.presence(document.activeElement, isField);
@@ -10964,7 +10965,7 @@ up.status = (function () {
         let focusCapsule = up.FocusCapsule.preserve(bindLayer);
         let applyPreviews = () => doRunPreviews(request, renderOptions);
         let revertPreviews = bindLayer.asCurrent(applyPreviews);
-        up.on('focusin', { once: true }, () => focusCapsule = null);
+        focusCapsule?.autoVoid();
         return () => {
             bindLayer.asCurrent(revertPreviews);
             focusCapsule?.restore(bindLayer, { preventScroll: true });