Skip to content

added xhr.withCredentials=true to allow proper handling of credentials… #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
1 change: 0 additions & 1 deletion demos/json/data.json

This file was deleted.

6 changes: 3 additions & 3 deletions jsonary/_cache-json-schema-org.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ var hyperSchema = {
"allOf": {
"$ref": "#/definitions/schemaArray"
},
"oneOf": {
"$ref": "#/definitions/schemaArray"
},
// "oneOf": {
// "$ref": "#/definitions/schemaArray"
// },
"oneOf": {
"$ref": "#/definitions/schemaArray"
},
Expand Down
1 change: 1 addition & 0 deletions jsonary/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ publicApi.ajaxFunction = function (params, callback) {
}
xhr.setRequestHeader("Content-Type", encType);
xhr.setRequestHeader("If-Modified-Since", "Thu, 01 Jan 1970 00:00:00 GMT");
xhr.withCredentials=true;
xhr.send(xhrData);
};

Expand Down
6 changes: 6 additions & 0 deletions jsonary/schemaset.js
Original file line number Diff line number Diff line change
Expand Up @@ -1713,6 +1713,12 @@ SchemaSet.prototype = {
var subSchemaKey = Utils.getKeyVariant(schemaKey);
linkInstance.addMonitor(subSchemaKey, function (active) {
var rawLink = linkInstance.rawLink;

var linkPrefix=Jsonary.ogiitGlobalConst_LinkPrefix;
if(linkPrefix && rawLink &&rawLink.href && linkPrefix!=rawLink.href.substr(0,linkPrefix.length)
&& "http"!=rawLink.href.substr(0,4)
) {rawLink.href=linkPrefix+rawLink.href;}

var newUrl = active ? rawLink.href : null;
if (appliedUrl !== newUrl) {
appliedUrl = newUrl;
Expand Down
Loading