Remove refactor

Author: MichaelWest22

src/htmx.js

@@ -4039,19 +4039,25 @@ var htmx = (function() {
           returnPromise: true
         })
       } else {
-        const { target, swap, source, event, ...restContext } = context
-        let resolvedTarget = resolveTarget(target)
+        let resolvedTarget = resolveTarget(context.target)
         // If target is supplied but can't resolve OR source is supplied but both target and source can't be resolved
         // then use DUMMY_ELT to abort the request with htmx:targetError to avoid it replacing body by mistake
-        if ((target && !resolvedTarget) || (source && !resolvedTarget && !resolveTarget(source))) {
+        if ((context.target && !resolvedTarget) || (context.source && !resolvedTarget && !resolveTarget(context.source))) {
           resolvedTarget = DUMMY_ELT
         }
-        return issueAjaxRequest(verb, path, resolveTarget(source), event, {
-          ...restContext,
-          targetOverride: resolvedTarget,
-          swapOverride: swap,
-          returnPromise: true
-        })
+        return issueAjaxRequest(verb, path, resolveTarget(context.source), context.event,
+          {
+            handler: context.handler,
+            headers: context.headers,
+            values: context.values,
+            targetOverride: resolvedTarget,
+            swapOverride: context.swap,
+            select: context.select,
+            returnPromise: true,
+            push: context.push,
+            replace: context.replace,
+            selectOOB: context.selectOOB
+          })
       }
     } else {
       return issueAjaxRequest(verb, path, null, null, {
@@ -4629,39 +4635,82 @@ var htmx = (function() {
    * @return {HtmxHistoryUpdate}
    */
   function determineHistoryUpdates(elt, responseInfo) {
-    const { xhr, pathInfo, etc } = responseInfo
+    const xhr = responseInfo.xhr
 
-    let push = xhr.getResponseHeader('HX-Push') || xhr.getResponseHeader('HX-Push-Url')
-    let replace = xhr.getResponseHeader('HX-Replace-Url')
-    const headerPath = push || replace
+    //= ==========================================
+    // First consult response headers
+    //= ==========================================
+    let pathFromHeaders = null
+    let typeFromHeaders = null
+    if (hasHeader(xhr, /HX-Push:/i)) {
+      pathFromHeaders = xhr.getResponseHeader('HX-Push')
+      typeFromHeaders = 'push'
+    } else if (hasHeader(xhr, /HX-Push-Url:/i)) {
+      pathFromHeaders = xhr.getResponseHeader('HX-Push-Url')
+      typeFromHeaders = 'push'
+    } else if (hasHeader(xhr, /HX-Replace-Url:/i)) {
+      pathFromHeaders = xhr.getResponseHeader('HX-Replace-Url')
+      typeFromHeaders = 'replace'
+    }
 
     // if there was a response header, that has priority
-    if (!headerPath) {
-      // Next resolve via DOM values
-      push = getClosestAttributeValue(elt, 'hx-push-url') || etc.push
-      replace = getClosestAttributeValue(elt, 'hx-replace-url') || etc.replace
-      if (!push && !replace && getInternalData(elt).boosted) {
-        push = 'true'
+    if (pathFromHeaders) {
+      if (pathFromHeaders === 'false') {
+        return {}
+      } else {
+        return {
+          type: typeFromHeaders,
+          path: pathFromHeaders
+        }
       }
     }
-    let path = headerPath || push || replace
-    // unset or false indicates no push, return empty object
-    if (!path || path === 'false') {
-      return {}
-    }
 
-    // true indicates we want to follow wherever the server ended up sending us
-    if (path === 'true') {
-      path = pathInfo.responsePath || pathInfo.finalRequestPath // if there is no response path, go with the original request path
-    }
-    // restore any anchor associated with the request except for paths from respone headers to keep old behaviour
-    if ((!headerPath || headerPath === 'true') && pathInfo.anchor && path.indexOf('#') === -1) {
-      path = path + '#' + pathInfo.anchor
+    //= ==========================================
+    // Next resolve via DOM values
+    //= ==========================================
+    const requestPath = responseInfo.pathInfo.finalRequestPath
+    const responsePath = responseInfo.pathInfo.responsePath
+
+    const pushUrl = getClosestAttributeValue(elt, 'hx-push-url') || responseInfo.etc.push
+    const replaceUrl = getClosestAttributeValue(elt, 'hx-replace-url') || responseInfo.etc.replace
+    const elementIsBoosted = getInternalData(elt).boosted
+
+    let saveType = null
+    let path = null
+
+    if (pushUrl) {
+      saveType = 'push'
+      path = pushUrl
+    } else if (replaceUrl) {
+      saveType = 'replace'
+      path = replaceUrl
+    } else if (elementIsBoosted) {
+      saveType = 'push'
+      path = responsePath || requestPath // if there is no response path, go with the original request path
     }
 
-    return {
-      type: push ? 'push' : 'replace',
-      path
+    if (path) {
+    // false indicates no push, return empty object
+      if (path === 'false') {
+        return {}
+      }
+
+      // true indicates we want to follow wherever the server ended up sending us
+      if (path === 'true') {
+        path = responsePath || requestPath // if there is no response path, go with the original request path
+      }
+
+      // restore any anchor associated with the request
+      if (responseInfo.pathInfo.anchor && path.indexOf('#') === -1) {
+        path = path + '#' + responseInfo.pathInfo.anchor
+      }
+
+      return {
+        type: saveType,
+        path
+      }
+    } else {
+      return {}
     }
   }
 

test/core/api.js

@@ -726,20 +726,4 @@ describe('Core htmx API test', function() {
     var path = sessionStorage.getItem('htmx-current-path-for-history')
     path.should.equal('/abc123')
   })
-
-  it('ajax api passes custom context properties to htmx events', function() {
-    this.server.respondWith('GET', '/test', 'response')
-    var div = make("<div id='d1'></div>")
-    var customProp = null
-    var handler = htmx.on('htmx:beforeRequest', function(event) {
-      customProp = event.detail.etc.customProperty
-    })
-    htmx.ajax('GET', '/test', {
-      target: '#d1',
-      customProperty: 'testValue'
-    })
-    this.server.respond()
-    customProp.should.equal('testValue')
-    htmx.off('htmx:beforeRequest', handler)
-  })
 })

www/content/api.md

@@ -68,7 +68,6 @@ or
     * `selectOOB` - allows you to select content for out-of-band swaps from a response
     * `push` - can be `'true'` or a path to push a URL into browser location history
     * `replace` - can be `'true'` or a path to replace the URL in the browser location history
-    * *custom properties* - any additional properties will be passed to some htmx events via `event.detail.etc`
 
 ##### Example
 

www/content/headers/hx-push-url.md

@@ -6,16 +6,15 @@ description = """\
 
 The `HX-Push-Url` header allows you to push a URL into the browser [location history](https://developer.mozilla.org/en-US/docs/Web/API/History_API).
 This creates a new history entry, allowing navigation with the browser’s back and forward buttons.
-It works the same as [`hx-push-url` attribute](@/attributes/hx-push-url.md).
+This is similar to the [`hx-push-url` attribute](@/attributes/hx-push-url.md).
 
 If present, this header overrides any behavior defined with attributes.
 
 The possible values for this header are:
 
 1. A URL to be pushed into the location bar.
    This may be relative or absolute, as per [`history.pushState()`](https://developer.mozilla.org/en-US/docs/Web/API/History/pushState).
-2. `true`, which pushes the fetched URL into history and location bar.
-3. `false`, which prevents the browser’s history from being updated.
+2. `false`, which prevents the browser’s history from being updated.
 
 ## Notes
 

www/content/headers/hx-replace-url.md

@@ -7,16 +7,15 @@ description = """\
 
 The `HX-Replace-Url` header allows you to replace the current URL in the browser [location history](https://developer.mozilla.org/en-US/docs/Web/API/History_API).
 This does not create a new history entry; in effect, it removes the previous current URL from the browser’s history.
-It works the same as [`hx-replace-url` attribute](@/attributes/hx-replace-url.md).
+This is similar to the [`hx-replace-url` attribute](@/attributes/hx-replace-url.md).
 
 If present, this header overrides any behavior defined with attributes.
 
 The possible values for this header are:
 
 1. A URL to replace the current URL in the location bar.
    This may be relative or absolute, as per [`history.replaceState()`](https://developer.mozilla.org/en-US/docs/Web/API/History/replaceState), but must have the same origin as the current URL.
-2. `true`, which replaces the fetched URL into history and location bar.
-3. `false`, which prevents the browser’s current URL from being updated.
+2. `false`, which prevents the browser’s current URL from being updated.
 
 ## Notes