Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-02-12 15:48:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix bugs after live tests

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-09-15 17:13:56 +02:00
parent 780480fc9b
commit 7272663e8d
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Message/Request/Request.js
View File

@ -25,9 +25,11 @@
this.method = typeof method !== 'undefined' ? method : jsOMS.Message.Request.RequestMethod.GET; this.method = typeof method !== 'undefined' ? method : jsOMS.Message.Request.RequestMethod.GET;
this.requestHeader = []; this.requestHeader = [];
this.result = {}; this.result = {};
this.type = typeof type !== 'undefined' ? type : jsOMS.Message.Response.ResponseType.JSON; this.type = typeof type !== 'undefined' ? type : jsOMS.Message.Request.RequestType.JSON;
this.data = {}; this.data = {};
this.requestHeader['Content-Type'] = this.setContentTypeBasedOnType(this.type);
// todo: create log; // todo: create log;
this.result[0] = function() this.result[0] = function()
{ {
@ -38,6 +40,27 @@
this.xhr = new XMLHttpRequest(); this.xhr = new XMLHttpRequest();
}; };
/**
* Defines the request content type based on the type
*
* @return {string}
*
* @method
*
* @since 1.0.0
*/
setContentTypeBasedOnType(type)
{
switch(type) {
case jsOMS.Message.Request.RequestType.JSON:
return 'application/json';
case jsOMS.Message.Request.RequestType.URL_ENCODE:
return 'application/x-www-form-urlencoded';
default:
return 'text/plain';
}
};
/** /**
* Get browser. * Get browser.
* *
@ -370,13 +393,11 @@
}; };
if (this.type === jsOMS.Message.Request.RequestType.JSON) { if (this.type === jsOMS.Message.Request.RequestType.JSON) {
if (typeof this.requestHeader !== 'undefined' && this.requestHeader['Content-Type'] === 'application/json') { this.xhr.send(JSON.stringify(this.data));
this.xhr.send(JSON.stringify(this.data));
} else {
this.xhr.send(this.queryfy(this.data));
}
} else if (this.type === jsOMS.Message.Request.RequestType.RAW) { } else if (this.type === jsOMS.Message.Request.RequestType.RAW) {
this.xhr.send(this.data); this.xhr.send(this.data);
} else if (this.type === jsOMS.Message.Request.RequestType.URL_ENCODE) {
this.xhr.send(this.queryfy(this.data));
} }
}; };
} }

3
Message/Request/RequestType.js
View File

@ -15,6 +15,7 @@
jsOMS.Message.Request.RequestType = Object.freeze({ jsOMS.Message.Request.RequestType = Object.freeze({
JSON: 'json', JSON: 'json',
RAW: 'raw' RAW: 'raw',
URL_ENCODE: 'url'
}); });
}(window.jsOMS = window.jsOMS || {})); }(window.jsOMS = window.jsOMS || {}));