iLoveElysia/pjax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Use the same options object in handle-response as in send-request (#148)

Browse Source 
Instead of cloning this.options again in handle-response.js, pass the options object from send-request.js. This way, pjax.state.options will also have the request options.
This commit was merged in pull request #148.
This commit is contained in:
BehindTheMath
2018-04-26 09:27:50 -04:00
committed by GitHub
parent 358b6f6836
commit 7d26a75fdf
5 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/proto/attach-form.js
View File

@@ -40,8 +40,9 @@ var formAction = function(el, event) {
var tagName = element.tagName.toLowerCase()
// jscs:disable disallowImplicitTypeConversion
if (!!element.name && element.attributes !== undefined && tagName !== "button") {
var type = element.attributes.type
// jscs:enable disallowImplicitTypeConversion
var type = element.attributes.type
if ((!type || type.value !== "checkbox" && type.value !== "radio") || element.checked) {
// Build array of values to submit
var values = []

12
lib/proto/handle-response.js
View File

@@ -2,13 +2,13 @@ var clone = require("../util/clone.js")
var newUid = require("../uniqueid.js")
var trigger = require("../events/trigger.js")
module.exports = function(responseText, request, href) {
var tempOptions = clone(this.options);
tempOptions.request = request
module.exports = function(responseText, request, href, options) {
options = clone(options || this.options)
options.request = request
// Fail if unable to load HTML via AJAX
if (responseText === false) {
trigger(document, "pjax:complete pjax:error", tempOptions)
trigger(document, "pjax:complete pjax:error", options)
return
}
@@ -49,13 +49,13 @@ module.exports = function(responseText, request, href) {
}
this.state.href = href
this.state.options = clone(this.options)
this.state.options = options
try {
this.loadContent(responseText, this.options)
}
catch (e) {
trigger(document, "pjax:error", tempOptions)
trigger(document, "pjax:error", options)
if (!this.options.debug) {
if (console && console.error) {