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

Merge pull request #112 from timtrinidad/master

Browse Source 
Use a local clone of options when initiating requests, so requestOptions don't persist
This commit was merged in pull request #112.
This commit is contained in:
BehindTheMath
2018-01-23 15:44:26 -05:00
committed by GitHub
parent 6000ad5620 feb85382f2
commit 8fcef04c9e
5 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,14 +6,19 @@ var clone = require("../clone")
var attrClick = "data-pjax-click-state"
var formAction = function(el, event) {
this.options.requestOptions = {
// Since loadUrl modifies options and we may add our own modifications below,
// clone it so the changes don't persist
var options = clone(this.options);
// Initialize requestOptions
options.requestOptions = {
requestUrl: el.getAttribute("action") || window.location.href,
requestMethod: el.getAttribute("method") || "GET",
}
// create a testable virtual link of the form action
var virtLinkElement = document.createElement("a");
virtLinkElement.setAttribute("href", this.options.requestOptions.requestUrl);
virtLinkElement.setAttribute("href", options.requestOptions.requestUrl);
// Ignore external links.
if (virtLinkElement.protocol !== window.location.protocol || virtLinkElement.host !== window.location.host) {
@@ -34,7 +39,7 @@ var formAction = function(el, event) {
}
// if declared as a full reload, just normally submit the form
if (this.options.currentUrlFullReload) {
if (options.currentUrlFullReload) {
el.setAttribute(attrClick, "reload");
return;
}
@@ -56,12 +61,12 @@ var formAction = function(el, event) {
// Creating a getString
var paramsString = (paramObject.map(function(value) {return value.name + "=" + value.value;})).join("&");
this.options.requestOptions.requestPayload = paramObject;
this.options.requestOptions.requestPayloadString = paramsString;
options.requestOptions.requestPayload = paramObject;
options.requestOptions.requestPayloadString = paramsString;
el.setAttribute(attrClick, "submit");
var options = clone(this.options);
options.triggerElement = el;
this.loadUrl(virtLinkElement.href, options);
};

10
lib/proto/attach-link.js
View File

@@ -7,6 +7,13 @@ var attrClick = "data-pjax-click-state"
var attrKey = "data-pjax-keyup-state"
var linkAction = function(el, event) {
// Since loadUrl modifies options and we may add our own modifications below,
// clone it so the changes don't persist
var options = clone(this.options);
// Initialize requestOptions since loadUrl expects it to be an object
options.requestOptions = {};
// Don’t break browser special behavior on links (like page in new window)
if (event.which > 1 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) {
el.setAttribute(attrClick, "modifier")
@@ -51,10 +58,9 @@ var linkAction = function(el, event) {
this.reload()
return
}
this.options.requestOptions = this.options.requestOptions || {};
el.setAttribute(attrClick, "load")
var options = clone(this.options)
options.triggerElement = el
this.loadUrl(el.href, options)
}