jsf.js_next_gen 4.0.0-RC.3 → 4.0.0-RC.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/docs/assets/main.js +56 -52
- package/dist/docs/assets/style.css +23 -0
- package/dist/window/faces-development.js +2961 -3011
- package/dist/window/faces-development.js.br +0 -0
- package/dist/window/faces-development.js.gz +0 -0
- package/dist/window/faces-development.js.map +1 -1
- package/dist/window/faces.js +1 -1
- package/dist/window/faces.js.LICENSE.txt +0 -2
- package/dist/window/faces.js.br +0 -0
- package/dist/window/faces.js.gz +0 -0
- package/dist/window/faces.js.map +1 -1
- package/dist/window/jsf-development.js +2966 -3016
- package/dist/window/jsf-development.js.br +0 -0
- package/dist/window/jsf-development.js.gz +0 -0
- package/dist/window/jsf-development.js.map +1 -1
- package/dist/window/jsf.js +1 -1
- package/dist/window/jsf.js.LICENSE.txt +0 -2
- package/dist/window/jsf.js.br +0 -0
- package/dist/window/jsf.js.gz +0 -0
- package/dist/window/jsf.js.map +1 -1
- package/package.json +16 -16
- package/src/main/test.xml +23 -0
- package/src/main/typescript/@types/definitions/index.d.ts +12 -7
- package/src/main/typescript/api/_api.ts +4 -3
- package/src/main/typescript/impl/AjaxImpl.ts +125 -41
- package/src/main/typescript/impl/core/Const.ts +52 -41
- package/src/main/typescript/impl/util/Assertions.ts +16 -8
- package/src/main/typescript/impl/util/ExtDomQuery.ts +12 -4
- package/src/main/typescript/impl/util/FileUtils.ts +66 -0
- package/src/main/typescript/impl/util/HiddenInputBuilder.ts +89 -0
- package/src/main/typescript/impl/util/Lang.ts +9 -11
- package/src/main/typescript/impl/xhrCore/ErrorData.ts +15 -10
- package/src/main/typescript/impl/xhrCore/EventData.ts +2 -2
- package/src/main/typescript/impl/xhrCore/IResponseProcessor.ts +15 -1
- package/src/main/typescript/impl/xhrCore/RequestDataResolver.ts +69 -24
- package/src/main/typescript/impl/xhrCore/ResonseDataResolver.ts +4 -4
- package/src/main/typescript/impl/xhrCore/Response.ts +55 -38
- package/src/main/typescript/impl/xhrCore/ResponseProcessor.ts +173 -98
- package/src/main/typescript/impl/xhrCore/XhrFormData.ts +91 -168
- package/src/main/typescript/impl/xhrCore/XhrRequest.ts +39 -23
- package/src/main/typescript/myfaces/OamSubmit.ts +29 -13
- package/src/main/typescript/test/frameworkBase/_ext/monadish/DomQueryTest.spec.ts +1 -1
- package/src/main/typescript/test/frameworkBase/_ext/shared/StandardInits.ts +73 -1
- package/src/main/typescript/test/frameworkBase/_ext/shared/XmlResponses.ts +40 -1
- package/src/main/typescript/test/impl/ImplTest.spec.ts +3 -3
- package/src/main/typescript/test/impl/ImplTest_23.spec.ts +3 -3
- package/src/main/typescript/test/xhrCore/EventTests.spec.ts +1 -1
- package/src/main/typescript/test/xhrCore/FileUploadTest.spec.ts +5 -2
- package/src/main/typescript/test/xhrCore/NamespacesRequestTest.spec.ts +203 -0
- package/src/main/typescript/test/xhrCore/OamSubmitTest.spec.ts +177 -0
- package/src/main/typescript/test/xhrCore/RequestParamsTest.spec.ts +158 -17
- package/src/main/typescript/test/xhrCore/RequestTest.spec.ts +70 -3
- package/src/main/typescript/test/xhrCore/RequestTest_23.spec.ts +39 -3
- package/src/main/typescript/test/xhrCore/ResponseTest.spec.ts +372 -34
- package/src/main/typescript/test/xhrCore/ResponseTest23.spec.ts +43 -9
- package/src/main/typescript/test/xhrCore/XhrFormDataTest.spec.ts +67 -49
- package/src/main/typescript/test.xml +6 -0
- package/src/main/typescript/tsconfig.json +2 -2
- package/src/test/resources/jsf-development.js +1 -1
- package/src/tmp/test.html +12 -88
- package/target/api/_api.js +16 -29
- package/target/api/_api.js.map +1 -1
- package/target/api/faces.js +4 -4
- package/target/api/faces.js.map +1 -1
- package/target/api/jsf.js +9 -9
- package/target/api/jsf.js.map +1 -1
- package/target/classes/com/example/jsfs_js_ts/DecoratedFacesJS.class +0 -0
- package/target/classes/com/example/jsfs_js_ts/DecoratingResourceHandlerWrapper.class +0 -0
- package/target/classes/com/example/jsfs_js_ts/FacesJSMapFileResourceWrapper.class +0 -0
- package/target/classes/com/example/jsfs_js_ts/FacesJSMappingDecorator.class +0 -0
- package/target/impl/AjaxImpl.js +155 -89
- package/target/impl/AjaxImpl.js.map +1 -1
- package/target/impl/PushImpl.js +45 -48
- package/target/impl/PushImpl.js.map +1 -1
- package/target/impl/core/Const.js +52 -40
- package/target/impl/core/Const.js.map +1 -1
- package/target/impl/core/Context.js +10 -0
- package/target/impl/core/Context.js.map +1 -0
- package/target/impl/core/ImplTypes.js +9 -14
- package/target/impl/core/ImplTypes.js.map +1 -1
- package/target/impl/i18n/Messages.js +3 -4
- package/target/impl/i18n/Messages.js.map +1 -1
- package/target/impl/util/Assertions.js +20 -24
- package/target/impl/util/Assertions.js.map +1 -1
- package/target/impl/util/AsyncQueue.js +28 -36
- package/target/impl/util/AsyncQueue.js.map +1 -1
- package/target/impl/util/ExtDomQuery.js +153 -221
- package/target/impl/util/ExtDomQuery.js.map +1 -1
- package/target/impl/util/FileUtils.js +64 -0
- package/target/impl/util/FileUtils.js.map +1 -0
- package/target/impl/util/HiddenElementBuilder.js +7 -0
- package/target/impl/util/HiddenElementBuilder.js.map +1 -0
- package/target/impl/util/HiddenInputBuilder.js +79 -0
- package/target/impl/util/HiddenInputBuilder.js.map +1 -0
- package/target/impl/util/Lang.js +23 -32
- package/target/impl/util/Lang.js.map +1 -1
- package/target/impl/util/URLCodec.js +77 -0
- package/target/impl/util/URLCodec.js.map +1 -0
- package/target/impl/xhrCore/ErrorData.js +41 -64
- package/target/impl/xhrCore/ErrorData.js.map +1 -1
- package/target/impl/xhrCore/EventData.js +10 -13
- package/target/impl/xhrCore/EventData.js.map +1 -1
- package/target/impl/xhrCore/RequestContext.js +11 -0
- package/target/impl/xhrCore/RequestContext.js.map +1 -0
- package/target/impl/xhrCore/RequestDataResolver.js +71 -27
- package/target/impl/xhrCore/RequestDataResolver.js.map +1 -1
- package/target/impl/xhrCore/ResonseDataResolver.js +16 -16
- package/target/impl/xhrCore/ResonseDataResolver.js.map +1 -1
- package/target/impl/xhrCore/Response.js +43 -28
- package/target/impl/xhrCore/Response.js.map +1 -1
- package/target/impl/xhrCore/ResponseProcessor.js +217 -162
- package/target/impl/xhrCore/ResponseProcessor.js.map +1 -1
- package/target/impl/xhrCore/XhrFormData.js +92 -208
- package/target/impl/xhrCore/XhrFormData.js.map +1 -1
- package/target/impl/xhrCore/XhrRequest.js +104 -104
- package/target/impl/xhrCore/XhrRequest.js.map +1 -1
- package/target/myfaces/OamSubmit.js +33 -24
- package/target/myfaces/OamSubmit.js.map +1 -1
- package/target/test/frameworkBase/LangTest.spec.js +46 -32
- package/target/test/frameworkBase/LangTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/DomQueryTest.spec.js +238 -228
- package/target/test/frameworkBase/_ext/monadish/DomQueryTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/LangTest.spec.js +45 -31
- package/target/test/frameworkBase/_ext/monadish/LangTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/MappingProbes.js +24 -33
- package/target/test/frameworkBase/_ext/monadish/MappingProbes.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/MappingTest.spec.js +8 -8
- package/target/test/frameworkBase/_ext/monadish/MappingTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/MonadTest.spec.js +31 -31
- package/target/test/frameworkBase/_ext/monadish/MonadTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/StreamTest.spec.js +50 -48
- package/target/test/frameworkBase/_ext/monadish/StreamTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/shared/StandardInits.js +310 -132
- package/target/test/frameworkBase/_ext/shared/StandardInits.js.map +1 -1
- package/target/test/frameworkBase/_ext/shared/XmlResponses.js +235 -22
- package/target/test/frameworkBase/_ext/shared/XmlResponses.js.map +1 -1
- package/target/test/impl/ImplTest.spec.js +32 -59
- package/target/test/impl/ImplTest.spec.js.map +1 -1
- package/target/test/impl/ImplTest_23.spec.js +32 -59
- package/target/test/impl/ImplTest_23.spec.js.map +1 -1
- package/target/test/impl/SeparatorCharsTest.spec.js +17 -17
- package/target/test/impl/SeparatorCharsTest.spec.js.map +1 -1
- package/target/test/myfaces/OamSubmit.spec.js +25 -25
- package/target/test/myfaces/OamSubmit.spec.js.map +1 -1
- package/target/test/queue/AsynchronousProbe.js +23 -29
- package/target/test/queue/AsynchronousProbe.js.map +1 -1
- package/target/test/queue/AsynchronousQueueTest.spec.js +39 -70
- package/target/test/queue/AsynchronousQueueTest.spec.js.map +1 -1
- package/target/test/xhrCore/EventTests.spec.js +43 -74
- package/target/test/xhrCore/EventTests.spec.js.map +1 -1
- package/target/test/xhrCore/FakeWebsocket.js +14 -16
- package/target/test/xhrCore/FakeWebsocket.js.map +1 -1
- package/target/test/xhrCore/FileUploadTest.spec.js +48 -78
- package/target/test/xhrCore/FileUploadTest.spec.js.map +1 -1
- package/target/test/xhrCore/NamespacesRequestTest.spec.js +204 -0
- package/target/test/xhrCore/NamespacesRequestTest.spec.js.map +1 -0
- package/target/test/xhrCore/OamSubmitTest.spec.js +180 -0
- package/target/test/xhrCore/OamSubmitTest.spec.js.map +1 -0
- package/target/test/xhrCore/RequestParamsTest.spec.js +174 -73
- package/target/test/xhrCore/RequestParamsTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestTest.spec.js +173 -149
- package/target/test/xhrCore/RequestTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestTest_23.spec.js +127 -142
- package/target/test/xhrCore/RequestTest_23.spec.js.map +1 -1
- package/target/test/xhrCore/ResponseTest.spec.js +415 -100
- package/target/test/xhrCore/ResponseTest.spec.js.map +1 -1
- package/target/test/xhrCore/ResponseTest23.spec.js +152 -91
- package/target/test/xhrCore/ResponseTest23.spec.js.map +1 -1
- package/target/test/xhrCore/ShadowDomTest.spec.js +30 -61
- package/target/test/xhrCore/ShadowDomTest.spec.js.map +1 -1
- package/target/test/xhrCore/WebsocketTest.js +60 -93
- package/target/test/xhrCore/WebsocketTest.js.map +1 -1
- package/target/test/xhrCore/XhrFormDataTest.spec.js +79 -30
- package/target/test/xhrCore/XhrFormDataTest.spec.js.map +1 -1
- package/target/test-classes/.gz +0 -0
- package/target/test-classes/com/example/jsfs_js_ts/JsfsJsTsApplicationTests.class +0 -0
- package/target/test-classes/fileuploadtest.html +24 -0
- package/target/test-classes/jsf-development.js +3559 -0
- package/target/test-classes/jsf-development.js.br +0 -0
- package/target/test-classes/jsf-development.js.gz +0 -0
- package/target/test-classes/jsf-development.js.map +1 -0
- package/target/test-classes/jsf.js +3 -0
- package/target/test-classes/jsf.js.br +0 -0
- package/target/test-classes/jsf.js.gz +0 -0
- package/tmp.xml +36 -0
|
@@ -16,14 +16,14 @@
|
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.XhrRequest = void 0;
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
19
|
+
const mona_dish_1 = require("mona-dish");
|
|
20
|
+
const AjaxImpl_1 = require("../AjaxImpl");
|
|
21
|
+
const XhrFormData_1 = require("./XhrFormData");
|
|
22
|
+
const ErrorData_1 = require("./ErrorData");
|
|
23
|
+
const EventData_1 = require("./EventData");
|
|
24
|
+
const Lang_1 = require("../util/Lang");
|
|
25
|
+
const Const_1 = require("../core/Const");
|
|
26
|
+
const RequestDataResolver_1 = require("./RequestDataResolver");
|
|
27
27
|
var failSaveExecute = Lang_1.ExtLang.failSaveExecute;
|
|
28
28
|
/**
|
|
29
29
|
* Faces XHR Request Wrapper
|
|
@@ -33,8 +33,9 @@ var failSaveExecute = Lang_1.ExtLang.failSaveExecute;
|
|
|
33
33
|
* a single ajax request into our queue
|
|
34
34
|
* and let the queue do the processing.
|
|
35
35
|
*
|
|
36
|
+
*
|
|
36
37
|
*/
|
|
37
|
-
|
|
38
|
+
class XhrRequest {
|
|
38
39
|
/**
|
|
39
40
|
* Required Parameters
|
|
40
41
|
*
|
|
@@ -51,13 +52,7 @@ var XhrRequest = /** @class */ (function () {
|
|
|
51
52
|
* @param contentType optional content type, default "application/x-www-form-urlencoded"
|
|
52
53
|
* @param xhrObject optional xhr object which must fulfill the XMLHTTPRequest api, default XMLHttpRequest
|
|
53
54
|
*/
|
|
54
|
-
|
|
55
|
-
if (partialIdsArray === void 0) { partialIdsArray = []; }
|
|
56
|
-
if (timeout === void 0) { timeout = Const_1.NO_TIMEOUT; }
|
|
57
|
-
if (ajaxType === void 0) { ajaxType = Const_1.REQ_TYPE_POST; }
|
|
58
|
-
if (contentType === void 0) { contentType = Const_1.URL_ENCODED; }
|
|
59
|
-
if (xhrObject === void 0) { xhrObject = new XMLHttpRequest(); }
|
|
60
|
-
var _this = this;
|
|
55
|
+
constructor(source, sourceForm, requestContext, internalContext, partialIdsArray = [], timeout = Const_1.NO_TIMEOUT, ajaxType = Const_1.REQ_TYPE_POST, contentType = Const_1.URL_ENCODED, xhrObject = new XMLHttpRequest()) {
|
|
61
56
|
this.source = source;
|
|
62
57
|
this.sourceForm = sourceForm;
|
|
63
58
|
this.requestContext = requestContext;
|
|
@@ -76,23 +71,19 @@ var XhrRequest = /** @class */ (function () {
|
|
|
76
71
|
// we omit promises here because we have to deal with cancel functionality,
|
|
77
72
|
// and promises to not provide that (yet) instead we have our async queue
|
|
78
73
|
// which uses an api internally, which is very close to promises
|
|
79
|
-
this.registerXhrCallbacks(
|
|
80
|
-
|
|
81
|
-
},
|
|
82
|
-
|
|
74
|
+
this.registerXhrCallbacks((data) => {
|
|
75
|
+
this.resolve(data);
|
|
76
|
+
}, (data) => {
|
|
77
|
+
this.reject(data);
|
|
83
78
|
});
|
|
84
79
|
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
var executesArr = function () {
|
|
91
|
-
return _this.requestContext.getIf(Const_1.CTX_PARAM_PASS_THR, Const_1.P_EXECUTE).get("none").value.split(/\s+/gi);
|
|
80
|
+
start() {
|
|
81
|
+
let ignoreErr = failSaveExecute;
|
|
82
|
+
let xhrObject = this.xhrObject;
|
|
83
|
+
let executesArr = () => {
|
|
84
|
+
return this.requestContext.getIf(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_EXECUTE).get(Const_1.IDENT_NONE).value.split(/\s+/gi);
|
|
92
85
|
};
|
|
93
86
|
try {
|
|
94
|
-
var formElement = this.sourceForm.getAsElem(0).value;
|
|
95
|
-
var viewState = ((_a = window === null || window === void 0 ? void 0 : window.faces) !== null && _a !== void 0 ? _a : window === null || window === void 0 ? void 0 : window.jsf).getViewState(formElement);
|
|
96
87
|
// encoded we need to decode
|
|
97
88
|
// We generated a base representation of the current form
|
|
98
89
|
// in case someone has overloaded the viewState with additional decorators we merge
|
|
@@ -101,19 +92,29 @@ var XhrRequest = /** @class */ (function () {
|
|
|
101
92
|
// whatever the formData object delivers
|
|
102
93
|
// the partialIdsArray arr is almost deprecated legacy code where we allowed to send a separate list of partial
|
|
103
94
|
// ids for reduced load and server processing, this will be removed soon, we can handle the same via execute
|
|
104
|
-
// anyway TODO
|
|
105
|
-
|
|
95
|
+
// anyway TODO reimplement the partial ids array, we still do not have it in jsf the way we need it
|
|
96
|
+
let formData = new XhrFormData_1.XhrFormData(this.sourceForm, (0, RequestDataResolver_1.resoveNamingContainerMapper)(this.internalContext), executesArr(), this.partialIdsArray);
|
|
106
97
|
this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
|
|
107
98
|
// next step the pass through parameters are merged in for post params
|
|
108
|
-
|
|
109
|
-
|
|
99
|
+
this.requestContext.$nspEnabled = false;
|
|
100
|
+
let requestContext = this.requestContext;
|
|
101
|
+
let requestPassThroughParams = requestContext.getIf(Const_1.CTX_PARAM_REQ_PASS_THR);
|
|
102
|
+
// we are turning off here the jsf, faces remapping because we are now dealing with
|
|
103
|
+
// pass-through parameters
|
|
104
|
+
requestPassThroughParams.$nspEnabled = false;
|
|
110
105
|
// this is an extension where we allow pass through parameters to be sent down additionally
|
|
111
106
|
// this can be used and is used in the impl to enrich the post request parameters with additional
|
|
112
107
|
// information
|
|
113
|
-
|
|
114
|
-
|
|
108
|
+
try {
|
|
109
|
+
formData.shallowMerge(requestPassThroughParams, true, true);
|
|
110
|
+
}
|
|
111
|
+
finally {
|
|
112
|
+
this.requestContext.$nspEnabled = true;
|
|
113
|
+
requestPassThroughParams.$nspEnabled = true;
|
|
114
|
+
}
|
|
115
|
+
this.responseContext = requestPassThroughParams.deepCopy;
|
|
115
116
|
// we have to shift the internal passthroughs around to build up our response context
|
|
116
|
-
|
|
117
|
+
let responseContext = this.responseContext;
|
|
117
118
|
responseContext.assign(Const_1.CTX_PARAM_MF_INTERNAL).value = this.internalContext.value;
|
|
118
119
|
// per spec the onevent and onerror handlers must be passed through to the response
|
|
119
120
|
responseContext.assign(Const_1.ON_EVENT).value = requestContext.getIf(Const_1.ON_EVENT).value;
|
|
@@ -125,13 +126,13 @@ var XhrRequest = /** @class */ (function () {
|
|
|
125
126
|
// normal browsers should resolve this
|
|
126
127
|
// tests can quietly fail on this one
|
|
127
128
|
if (this.contentType != "undefined") {
|
|
128
|
-
ignoreErr(
|
|
129
|
+
ignoreErr(() => xhrObject.setRequestHeader(Const_1.CONTENT_TYPE, `${this.contentType}; charset=utf-8`));
|
|
129
130
|
}
|
|
130
|
-
ignoreErr(
|
|
131
|
+
ignoreErr(() => xhrObject.setRequestHeader(Const_1.HEAD_FACES_REQ, Const_1.VAL_AJAX));
|
|
131
132
|
// probably not needed anymore, will test this
|
|
132
133
|
// some webkit based mobile browsers do not follow the w3c spec of
|
|
133
134
|
// setting, they accept headers automatically
|
|
134
|
-
ignoreErr(
|
|
135
|
+
ignoreErr(() => xhrObject.setRequestHeader(Const_1.REQ_ACCEPT, Const_1.STD_ACCEPT));
|
|
135
136
|
this.sendEvent(Const_1.BEGIN);
|
|
136
137
|
this.sendRequest(formData);
|
|
137
138
|
}
|
|
@@ -140,39 +141,39 @@ var XhrRequest = /** @class */ (function () {
|
|
|
140
141
|
this.handleError(e);
|
|
141
142
|
}
|
|
142
143
|
return this;
|
|
143
|
-
}
|
|
144
|
-
|
|
144
|
+
}
|
|
145
|
+
cancel() {
|
|
145
146
|
try {
|
|
146
147
|
this.xhrObject.abort();
|
|
147
148
|
}
|
|
148
149
|
catch (e) {
|
|
149
150
|
this.handleError(e);
|
|
150
151
|
}
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
mona_dish_1.Stream.of
|
|
152
|
+
}
|
|
153
|
+
resolve(data) {
|
|
154
|
+
mona_dish_1.Stream.of(...this.thenFunctions).reduce((inputVal, thenFunc) => {
|
|
154
155
|
return thenFunc(inputVal);
|
|
155
156
|
}, data);
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
mona_dish_1.Stream.of
|
|
157
|
+
}
|
|
158
|
+
reject(data) {
|
|
159
|
+
mona_dish_1.Stream.of(...this.catchFunctions).reduce((inputVal, catchFunc) => {
|
|
159
160
|
return catchFunc(inputVal);
|
|
160
161
|
}, data);
|
|
161
|
-
}
|
|
162
|
-
|
|
162
|
+
}
|
|
163
|
+
catch(func) {
|
|
163
164
|
this.catchFunctions.push(func);
|
|
164
165
|
return this;
|
|
165
|
-
}
|
|
166
|
-
|
|
166
|
+
}
|
|
167
|
+
finally(func) {
|
|
167
168
|
// no ie11 support we probably are going to revert to shims for that one
|
|
168
169
|
this.catchFunctions.push(func);
|
|
169
170
|
this.thenFunctions.push(func);
|
|
170
171
|
return this;
|
|
171
|
-
}
|
|
172
|
-
|
|
172
|
+
}
|
|
173
|
+
then(func) {
|
|
173
174
|
this.thenFunctions.push(func);
|
|
174
175
|
return this;
|
|
175
|
-
}
|
|
176
|
+
}
|
|
176
177
|
/**
|
|
177
178
|
* attaches the internal event and processing
|
|
178
179
|
* callback within the promise to our xhr object
|
|
@@ -180,57 +181,56 @@ var XhrRequest = /** @class */ (function () {
|
|
|
180
181
|
* @param resolve
|
|
181
182
|
* @param reject
|
|
182
183
|
*/
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
_this.onAbort(reject);
|
|
184
|
+
registerXhrCallbacks(resolve, reject) {
|
|
185
|
+
let xhrObject = this.xhrObject;
|
|
186
|
+
xhrObject.onabort = () => {
|
|
187
|
+
this.onAbort(reject);
|
|
188
188
|
};
|
|
189
|
-
xhrObject.ontimeout =
|
|
190
|
-
|
|
189
|
+
xhrObject.ontimeout = () => {
|
|
190
|
+
this.onTimeout(reject);
|
|
191
191
|
};
|
|
192
|
-
xhrObject.onload =
|
|
193
|
-
|
|
192
|
+
xhrObject.onload = () => {
|
|
193
|
+
this.onSuccess(resolve);
|
|
194
194
|
};
|
|
195
|
-
xhrObject.onloadend =
|
|
196
|
-
|
|
195
|
+
xhrObject.onloadend = () => {
|
|
196
|
+
this.onDone(this.xhrObject, resolve);
|
|
197
197
|
};
|
|
198
|
-
xhrObject.onerror =
|
|
198
|
+
xhrObject.onerror = (errorData) => {
|
|
199
199
|
// some browsers trigger an error when cancelling a request internally
|
|
200
200
|
// in this case we simply ignore the request and clear up the queue, because
|
|
201
201
|
// it is not safe anymore to proceed with the current queue
|
|
202
202
|
// This bypasses a Safari issue where it keeps requests hanging after page unload
|
|
203
203
|
// and then triggers a cancel error on then instead of just stopping
|
|
204
204
|
// and clearing the code
|
|
205
|
-
if (
|
|
205
|
+
if (this.isCancelledResponse(this.xhrObject)) {
|
|
206
206
|
reject();
|
|
207
|
-
|
|
207
|
+
this.stopProgress = true;
|
|
208
208
|
return;
|
|
209
209
|
}
|
|
210
|
-
|
|
210
|
+
this.onError(errorData, reject);
|
|
211
211
|
};
|
|
212
|
-
}
|
|
213
|
-
|
|
212
|
+
}
|
|
213
|
+
isCancelledResponse(currentTarget) {
|
|
214
214
|
return (currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.status) === 0 && // cancelled by browser
|
|
215
215
|
(currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.readyState) === 4 &&
|
|
216
216
|
(currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.responseText) === '' &&
|
|
217
217
|
(currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.responseXML) === null;
|
|
218
|
-
}
|
|
218
|
+
}
|
|
219
219
|
/*
|
|
220
220
|
* xhr processing callbacks
|
|
221
221
|
*
|
|
222
222
|
* Those methods are the callbacks called by
|
|
223
223
|
* the xhr object depending on its own state
|
|
224
224
|
*/
|
|
225
|
-
|
|
225
|
+
onAbort(reject) {
|
|
226
226
|
reject();
|
|
227
|
-
}
|
|
228
|
-
|
|
227
|
+
}
|
|
228
|
+
onTimeout(reject) {
|
|
229
229
|
this.sendEvent(Const_1.STATE_EVT_TIMEOUT);
|
|
230
230
|
reject();
|
|
231
|
-
}
|
|
232
|
-
|
|
233
|
-
var _a, _b
|
|
231
|
+
}
|
|
232
|
+
onSuccess(resolve) {
|
|
233
|
+
var _a, _b;
|
|
234
234
|
this.sendEvent(Const_1.COMPLETE);
|
|
235
235
|
// malformed responses always result in empty response xml
|
|
236
236
|
// per spec a valid response cannot be empty
|
|
@@ -238,19 +238,19 @@ var XhrRequest = /** @class */ (function () {
|
|
|
238
238
|
this.handleMalFormedXML(resolve);
|
|
239
239
|
return;
|
|
240
240
|
}
|
|
241
|
-
(
|
|
242
|
-
}
|
|
243
|
-
|
|
241
|
+
(0, Const_1.$faces)().ajax.response(this.xhrObject, (_b = this.responseContext.value) !== null && _b !== void 0 ? _b : {});
|
|
242
|
+
}
|
|
243
|
+
handleMalFormedXML(resolve) {
|
|
244
244
|
var _a;
|
|
245
245
|
this.stopProgress = true;
|
|
246
|
-
|
|
246
|
+
let errorData = {
|
|
247
247
|
type: Const_1.ERROR,
|
|
248
248
|
status: Const_1.MALFORMEDXML,
|
|
249
249
|
responseCode: 200,
|
|
250
250
|
responseText: (_a = this.xhrObject) === null || _a === void 0 ? void 0 : _a.responseText,
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
251
|
+
// we remap the element just in case it gets replaced
|
|
252
|
+
// it will be unremapped
|
|
253
|
+
source: this.source.id.value
|
|
254
254
|
};
|
|
255
255
|
try {
|
|
256
256
|
this.handleError(errorData, true);
|
|
@@ -261,20 +261,20 @@ var XhrRequest = /** @class */ (function () {
|
|
|
261
261
|
resolve(errorData);
|
|
262
262
|
}
|
|
263
263
|
// non blocking non clearing
|
|
264
|
-
}
|
|
265
|
-
|
|
264
|
+
}
|
|
265
|
+
onDone(data, resolve) {
|
|
266
266
|
// if stop progress a special handling including resolve is already performed
|
|
267
267
|
if (this.stopProgress) {
|
|
268
268
|
return;
|
|
269
269
|
}
|
|
270
270
|
resolve(data);
|
|
271
|
-
}
|
|
272
|
-
|
|
271
|
+
}
|
|
272
|
+
onError(errorData, reject) {
|
|
273
273
|
this.handleError(errorData);
|
|
274
274
|
reject();
|
|
275
|
-
}
|
|
276
|
-
|
|
277
|
-
|
|
275
|
+
}
|
|
276
|
+
sendRequest(formData) {
|
|
277
|
+
let isPost = this.ajaxType != Const_1.REQ_TYPE_GET;
|
|
278
278
|
if (formData.isMultipartRequest) {
|
|
279
279
|
// in case of a multipart request we send in a formData object as body
|
|
280
280
|
this.xhrObject.send((isPost) ? formData.toFormData() : null);
|
|
@@ -283,32 +283,32 @@ var XhrRequest = /** @class */ (function () {
|
|
|
283
283
|
// in case of a normal request we send it normally
|
|
284
284
|
this.xhrObject.send((isPost) ? formData.toString() : null);
|
|
285
285
|
}
|
|
286
|
-
}
|
|
286
|
+
}
|
|
287
287
|
/*
|
|
288
288
|
* other helpers
|
|
289
289
|
*/
|
|
290
|
-
|
|
291
|
-
var
|
|
290
|
+
sendEvent(evtType) {
|
|
291
|
+
var _a;
|
|
292
|
+
let eventData = EventData_1.EventData.createFromRequest(this.xhrObject, this.requestContext, evtType);
|
|
292
293
|
try {
|
|
293
294
|
// User code error, we might cover
|
|
294
295
|
// this in onError, but also we cannot swallow it.
|
|
295
296
|
// We need to resolve the local handlers lazily,
|
|
296
297
|
// because some frameworks might decorate them over the context in the response
|
|
297
|
-
|
|
298
|
+
let eventHandler = (0, RequestDataResolver_1.resolveHandlerFunc)(this.requestContext, this.responseContext, Const_1.ON_EVENT);
|
|
298
299
|
AjaxImpl_1.Implementation.sendEvent(eventData, eventHandler);
|
|
299
300
|
}
|
|
300
301
|
catch (e) {
|
|
302
|
+
e.source = (_a = e === null || e === void 0 ? void 0 : e.source) !== null && _a !== void 0 ? _a : this.requestContext.getIf(Const_1.SOURCE).value;
|
|
301
303
|
this.handleError(e);
|
|
302
304
|
throw e;
|
|
303
305
|
}
|
|
304
|
-
}
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
var eventHandler = (0, RequestDataResolver_1.resolveHandlerFunc)(this.requestContext, this.responseContext, Const_1.ON_ERROR);
|
|
306
|
+
}
|
|
307
|
+
handleError(exception, responseFormatError = false) {
|
|
308
|
+
let errorData = (responseFormatError) ? ErrorData_1.ErrorData.fromHttpConnection(exception.source, exception.type, exception.status, exception.responseText, exception.responseCode, exception.status) : ErrorData_1.ErrorData.fromClient(exception);
|
|
309
|
+
let eventHandler = (0, RequestDataResolver_1.resolveHandlerFunc)(this.requestContext, this.responseContext, Const_1.ON_ERROR);
|
|
309
310
|
AjaxImpl_1.Implementation.sendError(errorData, eventHandler);
|
|
310
|
-
}
|
|
311
|
-
|
|
312
|
-
}());
|
|
311
|
+
}
|
|
312
|
+
}
|
|
313
313
|
exports.XhrRequest = XhrRequest;
|
|
314
314
|
//# sourceMappingURL=XhrRequest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XhrRequest.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/XhrRequest.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,
|
|
1
|
+
{"version":3,"file":"XhrRequest.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/XhrRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.oam = void 0;
|
|
19
|
-
|
|
19
|
+
const mona_dish_1 = require("mona-dish");
|
|
20
20
|
/**
|
|
21
21
|
* legacy code to enable various aspects
|
|
22
22
|
* of myfaces, used to be rendered inline
|
|
@@ -38,13 +38,13 @@ var oam;
|
|
|
38
38
|
*/
|
|
39
39
|
oam.setHiddenInput = function (formName, name, value) {
|
|
40
40
|
mona_dish_1.DQ.byId(document.forms[formName])
|
|
41
|
-
.each(
|
|
42
|
-
|
|
41
|
+
.each(form => {
|
|
42
|
+
const input = form.querySelectorAll(`input[type='hidden'][name='${name}']`);
|
|
43
43
|
if (input.isPresent()) {
|
|
44
44
|
input.inputValue.value = value;
|
|
45
45
|
}
|
|
46
46
|
else {
|
|
47
|
-
|
|
47
|
+
const newInput = mona_dish_1.DQ.fromMarkup(`<input type='hidden' id='${name}' name='${name}'>`);
|
|
48
48
|
newInput.inputValue.value = value;
|
|
49
49
|
newInput.appendTo(form);
|
|
50
50
|
}
|
|
@@ -58,43 +58,46 @@ var oam;
|
|
|
58
58
|
*/
|
|
59
59
|
oam.clearHiddenInput = function (formName, name) {
|
|
60
60
|
var _a, _b, _c;
|
|
61
|
-
|
|
61
|
+
let element = (_c = (_b = (_a = document.forms) === null || _a === void 0 ? void 0 : _a[formName]) === null || _b === void 0 ? void 0 : _b.elements) === null || _c === void 0 ? void 0 : _c[name];
|
|
62
62
|
if (!element) {
|
|
63
63
|
return;
|
|
64
64
|
}
|
|
65
65
|
mona_dish_1.DQ.byId(element).delete();
|
|
66
66
|
};
|
|
67
|
-
// noinspection JSUnusedGlobalSymbols
|
|
67
|
+
// noinspection JSUnusedGlobalSymbols,JSUnusedLocalSymbols
|
|
68
68
|
/**
|
|
69
69
|
* does special form submit remapping
|
|
70
70
|
* re-maps the issuing command link into something,
|
|
71
|
-
*
|
|
71
|
+
* the "decode" of the command link on the server can understand
|
|
72
72
|
*
|
|
73
73
|
* @param formName
|
|
74
74
|
* @param linkId
|
|
75
75
|
* @param target
|
|
76
76
|
* @param params
|
|
77
77
|
*/
|
|
78
|
-
oam.submitForm = function (formName, linkId, target, params) {
|
|
79
|
-
var _a, _b, _c, _d;
|
|
80
|
-
|
|
78
|
+
oam.submitForm = function (formName, linkId = null, target = null, params = {}) {
|
|
79
|
+
var _a, _b, _c, _d, _e, _f;
|
|
80
|
+
//handle a possible incoming null, not sure if this is used that way anywhere, but we allow it
|
|
81
|
+
params = (!params) ? {} : params;
|
|
82
|
+
let clearFn = 'clearFormHiddenParams_' + formName.replace(/-/g, '\$:').replace(/:/g, '_');
|
|
81
83
|
(_a = window === null || window === void 0 ? void 0 : window[clearFn]) === null || _a === void 0 ? void 0 : _a.call(window, formName);
|
|
82
84
|
//autoscroll code
|
|
83
85
|
if (((_d = (_c = (_b = window === null || window === void 0 ? void 0 : window.myfaces) === null || _b === void 0 ? void 0 : _b.core) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.autoScroll) && (window === null || window === void 0 ? void 0 : window.getScrolling)) {
|
|
84
86
|
myfaces.oam.setHiddenInput(formName, 'autoScroll', window === null || window === void 0 ? void 0 : window.getScrolling());
|
|
85
87
|
}
|
|
86
|
-
mona_dish_1.Stream.
|
|
87
|
-
|
|
88
|
-
});
|
|
88
|
+
let paramsStream = Array.isArray(params) ? mona_dish_1.Stream.of(...params) : mona_dish_1.Stream.ofAssoc(params);
|
|
89
|
+
paramsStream.each(([key, data]) => myfaces.oam.setHiddenInput(formName, key, data));
|
|
89
90
|
//we call the namespaced function, to allow decoration, via a direct call we would
|
|
90
|
-
myfaces.oam.setHiddenInput(formName,
|
|
91
|
-
mona_dish_1.DQ.byId(document.forms[formName]).each(
|
|
91
|
+
myfaces.oam.setHiddenInput(formName, `${formName}:_idcl`, linkId !== null && linkId !== void 0 ? linkId : '');
|
|
92
|
+
mona_dish_1.DQ.byId((_f = (_e = document.forms) === null || _e === void 0 ? void 0 : _e[formName]) !== null && _f !== void 0 ? _f : document.getElementById(formName)).each(form => {
|
|
92
93
|
var _a;
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
94
|
+
const ATTR_TARGET = "target";
|
|
95
|
+
const formElement = form.getAsElem(0).value;
|
|
96
|
+
const oldTarget = form.getAsElem(0).value.getAttribute("target");
|
|
97
|
+
if (target != "null" && target) {
|
|
98
|
+
form.getAsElem(0).value.setAttribute("target", target);
|
|
99
|
+
}
|
|
100
|
+
const result = (_a = formElement === null || formElement === void 0 ? void 0 : formElement.onsubmit) === null || _a === void 0 ? void 0 : _a.call(formElement, null);
|
|
98
101
|
try {
|
|
99
102
|
if ((!!result) || 'undefined' == typeof result) {
|
|
100
103
|
formElement.submit();
|
|
@@ -104,11 +107,17 @@ var oam;
|
|
|
104
107
|
window === null || window === void 0 ? void 0 : window.console.error(e);
|
|
105
108
|
}
|
|
106
109
|
finally {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
+
if (oldTarget == null || oldTarget == "null") {
|
|
111
|
+
form.getAsElem(0).value.removeAttribute("target");
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
form.getAsElem(0).value.setAttribute("target", oldTarget);
|
|
115
|
+
}
|
|
116
|
+
// noinspection JSUnusedLocalSymbols
|
|
117
|
+
paramsStream.each(([key, data]) => {
|
|
118
|
+
myfaces.oam.clearHiddenInput(formName, key);
|
|
110
119
|
});
|
|
111
|
-
myfaces.oam.clearHiddenInput(formName,
|
|
120
|
+
myfaces.oam.clearHiddenInput(formName, `${formName}:_idcl`);
|
|
112
121
|
}
|
|
113
122
|
});
|
|
114
123
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OamSubmit.js","sourceRoot":"","sources":["../../src/main/typescript/myfaces/OamSubmit.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"OamSubmit.js","sourceRoot":"","sources":["../../src/main/typescript/myfaces/OamSubmit.ts"],"names":[],"mappings":"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"}
|