jsf.js_next_gen 4.0.0-RC.6 → 4.0.0-RC.8
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 +1 -1
- package/dist/window/faces-development.js +2056 -2727
- 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.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 +2061 -2732
- 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.br +0 -0
- package/dist/window/jsf.js.gz +0 -0
- package/dist/window/jsf.js.map +1 -1
- package/package.json +6 -6
- package/src/main/typescript/impl/util/Assertions.ts +14 -6
- package/src/main/typescript/impl/xhrCore/RequestDataResolver.ts +11 -1
- package/src/main/typescript/test/xhrCore/RequestTest.spec.ts +65 -0
- package/src/main/typescript/tsconfig.json +1 -1
- package/target/api/_api.js +11 -25
- 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/impl/AjaxImpl.js +55 -63
- 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 +1 -1
- package/target/impl/core/Const.js.map +1 -1
- 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 +19 -23
- 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 +144 -219
- package/target/impl/util/ExtDomQuery.js.map +1 -1
- package/target/impl/util/Lang.js +21 -28
- package/target/impl/util/Lang.js.map +1 -1
- package/target/impl/xhrCore/ErrorData.js +36 -61
- 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/RequestDataResolver.js +27 -19
- 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 +16 -16
- package/target/impl/xhrCore/Response.js.map +1 -1
- package/target/impl/xhrCore/ResponseProcessor.js +119 -133
- package/target/impl/xhrCore/ResponseProcessor.js.map +1 -1
- package/target/impl/xhrCore/XhrFormData.js +72 -106
- package/target/impl/xhrCore/XhrFormData.js.map +1 -1
- package/target/impl/xhrCore/XhrRequest.js +85 -95
- package/target/impl/xhrCore/XhrRequest.js.map +1 -1
- package/target/myfaces/OamSubmit.js +17 -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 +247 -132
- package/target/test/frameworkBase/_ext/shared/StandardInits.js.map +1 -1
- package/target/test/frameworkBase/_ext/shared/XmlResponses.js +199 -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 +42 -73
- 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 +46 -77
- package/target/test/xhrCore/FileUploadTest.spec.js.map +1 -1
- package/target/test/xhrCore/OamSubmitTest.spec.js +49 -80
- package/target/test/xhrCore/OamSubmitTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestParamsTest.spec.js +37 -68
- package/target/test/xhrCore/RequestParamsTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestTest.spec.js +170 -147
- package/target/test/xhrCore/RequestTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestTest_23.spec.js +93 -140
- package/target/test/xhrCore/RequestTest_23.spec.js.map +1 -1
- package/target/test/xhrCore/ResponseTest.spec.js +122 -91
- package/target/test/xhrCore/ResponseTest.spec.js.map +1 -1
- package/target/test/xhrCore/ResponseTest23.spec.js +114 -83
- 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 +41 -15
- package/target/test/xhrCore/XhrFormDataTest.spec.js.map +1 -1
|
@@ -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
|
|
@@ -34,7 +34,7 @@ var failSaveExecute = Lang_1.ExtLang.failSaveExecute;
|
|
|
34
34
|
* and let the queue do the processing.
|
|
35
35
|
*
|
|
36
36
|
*/
|
|
37
|
-
|
|
37
|
+
class XhrRequest {
|
|
38
38
|
/**
|
|
39
39
|
* Required Parameters
|
|
40
40
|
*
|
|
@@ -51,13 +51,7 @@ var XhrRequest = /** @class */ (function () {
|
|
|
51
51
|
* @param contentType optional content type, default "application/x-www-form-urlencoded"
|
|
52
52
|
* @param xhrObject optional xhr object which must fulfill the XMLHTTPRequest api, default XMLHttpRequest
|
|
53
53
|
*/
|
|
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;
|
|
54
|
+
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
55
|
this.source = source;
|
|
62
56
|
this.sourceForm = sourceForm;
|
|
63
57
|
this.requestContext = requestContext;
|
|
@@ -76,23 +70,22 @@ var XhrRequest = /** @class */ (function () {
|
|
|
76
70
|
// we omit promises here because we have to deal with cancel functionality,
|
|
77
71
|
// and promises to not provide that (yet) instead we have our async queue
|
|
78
72
|
// which uses an api internally, which is very close to promises
|
|
79
|
-
this.registerXhrCallbacks(
|
|
80
|
-
|
|
81
|
-
},
|
|
82
|
-
|
|
73
|
+
this.registerXhrCallbacks((data) => {
|
|
74
|
+
this.resolve(data);
|
|
75
|
+
}, (data) => {
|
|
76
|
+
this.reject(data);
|
|
83
77
|
});
|
|
84
78
|
}
|
|
85
|
-
|
|
86
|
-
var _this = this;
|
|
79
|
+
start() {
|
|
87
80
|
var _a;
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
return
|
|
81
|
+
let ignoreErr = failSaveExecute;
|
|
82
|
+
let xhrObject = this.xhrObject;
|
|
83
|
+
let executesArr = () => {
|
|
84
|
+
return this.requestContext.getIf(Const_1.CTX_PARAM_PASS_THR, Const_1.P_EXECUTE).get("none").value.split(/\s+/gi);
|
|
92
85
|
};
|
|
93
86
|
try {
|
|
94
|
-
|
|
95
|
-
|
|
87
|
+
let formElement = this.sourceForm.getAsElem(0).value;
|
|
88
|
+
let 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
89
|
// encoded we need to decode
|
|
97
90
|
// We generated a base representation of the current form
|
|
98
91
|
// in case someone has overloaded the viewState with additional decorators we merge
|
|
@@ -102,18 +95,18 @@ var XhrRequest = /** @class */ (function () {
|
|
|
102
95
|
// the partialIdsArray arr is almost deprecated legacy code where we allowed to send a separate list of partial
|
|
103
96
|
// ids for reduced load and server processing, this will be removed soon, we can handle the same via execute
|
|
104
97
|
// anyway TODO remove the partial ids array
|
|
105
|
-
|
|
98
|
+
let formData = new XhrFormData_1.XhrFormData(this.sourceForm, viewState, executesArr(), this.partialIdsArray);
|
|
106
99
|
this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
|
|
107
100
|
// next step the pass through parameters are merged in for post params
|
|
108
|
-
|
|
109
|
-
|
|
101
|
+
let requestContext = this.requestContext;
|
|
102
|
+
let passThroughParams = requestContext.getIf(Const_1.CTX_PARAM_PASS_THR);
|
|
110
103
|
// this is an extension where we allow pass through parameters to be sent down additionally
|
|
111
104
|
// this can be used and is used in the impl to enrich the post request parameters with additional
|
|
112
105
|
// information
|
|
113
106
|
formData.shallowMerge(passThroughParams, true, true);
|
|
114
107
|
this.responseContext = passThroughParams.deepCopy;
|
|
115
108
|
// we have to shift the internal passthroughs around to build up our response context
|
|
116
|
-
|
|
109
|
+
let responseContext = this.responseContext;
|
|
117
110
|
responseContext.assign(Const_1.CTX_PARAM_MF_INTERNAL).value = this.internalContext.value;
|
|
118
111
|
// per spec the onevent and onerror handlers must be passed through to the response
|
|
119
112
|
responseContext.assign(Const_1.ON_EVENT).value = requestContext.getIf(Const_1.ON_EVENT).value;
|
|
@@ -125,13 +118,13 @@ var XhrRequest = /** @class */ (function () {
|
|
|
125
118
|
// normal browsers should resolve this
|
|
126
119
|
// tests can quietly fail on this one
|
|
127
120
|
if (this.contentType != "undefined") {
|
|
128
|
-
ignoreErr(
|
|
121
|
+
ignoreErr(() => xhrObject.setRequestHeader(Const_1.CONTENT_TYPE, `${this.contentType}; charset=utf-8`));
|
|
129
122
|
}
|
|
130
|
-
ignoreErr(
|
|
123
|
+
ignoreErr(() => xhrObject.setRequestHeader(Const_1.HEAD_FACES_REQ, Const_1.VAL_AJAX));
|
|
131
124
|
// probably not needed anymore, will test this
|
|
132
125
|
// some webkit based mobile browsers do not follow the w3c spec of
|
|
133
126
|
// setting, they accept headers automatically
|
|
134
|
-
ignoreErr(
|
|
127
|
+
ignoreErr(() => xhrObject.setRequestHeader(Const_1.REQ_ACCEPT, Const_1.STD_ACCEPT));
|
|
135
128
|
this.sendEvent(Const_1.BEGIN);
|
|
136
129
|
this.sendRequest(formData);
|
|
137
130
|
}
|
|
@@ -140,39 +133,39 @@ var XhrRequest = /** @class */ (function () {
|
|
|
140
133
|
this.handleError(e);
|
|
141
134
|
}
|
|
142
135
|
return this;
|
|
143
|
-
}
|
|
144
|
-
|
|
136
|
+
}
|
|
137
|
+
cancel() {
|
|
145
138
|
try {
|
|
146
139
|
this.xhrObject.abort();
|
|
147
140
|
}
|
|
148
141
|
catch (e) {
|
|
149
142
|
this.handleError(e);
|
|
150
143
|
}
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
mona_dish_1.Stream.of
|
|
144
|
+
}
|
|
145
|
+
resolve(data) {
|
|
146
|
+
mona_dish_1.Stream.of(...this.thenFunctions).reduce((inputVal, thenFunc) => {
|
|
154
147
|
return thenFunc(inputVal);
|
|
155
148
|
}, data);
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
mona_dish_1.Stream.of
|
|
149
|
+
}
|
|
150
|
+
reject(data) {
|
|
151
|
+
mona_dish_1.Stream.of(...this.catchFunctions).reduce((inputVal, catchFunc) => {
|
|
159
152
|
return catchFunc(inputVal);
|
|
160
153
|
}, data);
|
|
161
|
-
}
|
|
162
|
-
|
|
154
|
+
}
|
|
155
|
+
catch(func) {
|
|
163
156
|
this.catchFunctions.push(func);
|
|
164
157
|
return this;
|
|
165
|
-
}
|
|
166
|
-
|
|
158
|
+
}
|
|
159
|
+
finally(func) {
|
|
167
160
|
// no ie11 support we probably are going to revert to shims for that one
|
|
168
161
|
this.catchFunctions.push(func);
|
|
169
162
|
this.thenFunctions.push(func);
|
|
170
163
|
return this;
|
|
171
|
-
}
|
|
172
|
-
|
|
164
|
+
}
|
|
165
|
+
then(func) {
|
|
173
166
|
this.thenFunctions.push(func);
|
|
174
167
|
return this;
|
|
175
|
-
}
|
|
168
|
+
}
|
|
176
169
|
/**
|
|
177
170
|
* attaches the internal event and processing
|
|
178
171
|
* callback within the promise to our xhr object
|
|
@@ -180,56 +173,55 @@ var XhrRequest = /** @class */ (function () {
|
|
|
180
173
|
* @param resolve
|
|
181
174
|
* @param reject
|
|
182
175
|
*/
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
_this.onAbort(reject);
|
|
176
|
+
registerXhrCallbacks(resolve, reject) {
|
|
177
|
+
let xhrObject = this.xhrObject;
|
|
178
|
+
xhrObject.onabort = () => {
|
|
179
|
+
this.onAbort(reject);
|
|
188
180
|
};
|
|
189
|
-
xhrObject.ontimeout =
|
|
190
|
-
|
|
181
|
+
xhrObject.ontimeout = () => {
|
|
182
|
+
this.onTimeout(reject);
|
|
191
183
|
};
|
|
192
|
-
xhrObject.onload =
|
|
193
|
-
|
|
184
|
+
xhrObject.onload = () => {
|
|
185
|
+
this.onSuccess(resolve);
|
|
194
186
|
};
|
|
195
|
-
xhrObject.onloadend =
|
|
196
|
-
|
|
187
|
+
xhrObject.onloadend = () => {
|
|
188
|
+
this.onDone(this.xhrObject, resolve);
|
|
197
189
|
};
|
|
198
|
-
xhrObject.onerror =
|
|
190
|
+
xhrObject.onerror = (errorData) => {
|
|
199
191
|
// some browsers trigger an error when cancelling a request internally
|
|
200
192
|
// in this case we simply ignore the request and clear up the queue, because
|
|
201
193
|
// it is not safe anymore to proceed with the current queue
|
|
202
194
|
// This bypasses a Safari issue where it keeps requests hanging after page unload
|
|
203
195
|
// and then triggers a cancel error on then instead of just stopping
|
|
204
196
|
// and clearing the code
|
|
205
|
-
if (
|
|
197
|
+
if (this.isCancelledResponse(this.xhrObject)) {
|
|
206
198
|
reject();
|
|
207
|
-
|
|
199
|
+
this.stopProgress = true;
|
|
208
200
|
return;
|
|
209
201
|
}
|
|
210
|
-
|
|
202
|
+
this.onError(errorData, reject);
|
|
211
203
|
};
|
|
212
|
-
}
|
|
213
|
-
|
|
204
|
+
}
|
|
205
|
+
isCancelledResponse(currentTarget) {
|
|
214
206
|
return (currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.status) === 0 && // cancelled by browser
|
|
215
207
|
(currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.readyState) === 4 &&
|
|
216
208
|
(currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.responseText) === '' &&
|
|
217
209
|
(currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.responseXML) === null;
|
|
218
|
-
}
|
|
210
|
+
}
|
|
219
211
|
/*
|
|
220
212
|
* xhr processing callbacks
|
|
221
213
|
*
|
|
222
214
|
* Those methods are the callbacks called by
|
|
223
215
|
* the xhr object depending on its own state
|
|
224
216
|
*/
|
|
225
|
-
|
|
217
|
+
onAbort(reject) {
|
|
226
218
|
reject();
|
|
227
|
-
}
|
|
228
|
-
|
|
219
|
+
}
|
|
220
|
+
onTimeout(reject) {
|
|
229
221
|
this.sendEvent(Const_1.STATE_EVT_TIMEOUT);
|
|
230
222
|
reject();
|
|
231
|
-
}
|
|
232
|
-
|
|
223
|
+
}
|
|
224
|
+
onSuccess(resolve) {
|
|
233
225
|
var _a, _b, _c;
|
|
234
226
|
this.sendEvent(Const_1.COMPLETE);
|
|
235
227
|
// malformed responses always result in empty response xml
|
|
@@ -239,11 +231,11 @@ var XhrRequest = /** @class */ (function () {
|
|
|
239
231
|
return;
|
|
240
232
|
}
|
|
241
233
|
((_b = window === null || window === void 0 ? void 0 : window.faces) !== null && _b !== void 0 ? _b : window.jsf).ajax.response(this.xhrObject, (_c = this.responseContext.value) !== null && _c !== void 0 ? _c : {});
|
|
242
|
-
}
|
|
243
|
-
|
|
234
|
+
}
|
|
235
|
+
handleMalFormedXML(resolve) {
|
|
244
236
|
var _a;
|
|
245
237
|
this.stopProgress = true;
|
|
246
|
-
|
|
238
|
+
let errorData = {
|
|
247
239
|
type: Const_1.ERROR,
|
|
248
240
|
status: Const_1.MALFORMEDXML,
|
|
249
241
|
responseCode: 200,
|
|
@@ -261,20 +253,20 @@ var XhrRequest = /** @class */ (function () {
|
|
|
261
253
|
resolve(errorData);
|
|
262
254
|
}
|
|
263
255
|
// non blocking non clearing
|
|
264
|
-
}
|
|
265
|
-
|
|
256
|
+
}
|
|
257
|
+
onDone(data, resolve) {
|
|
266
258
|
// if stop progress a special handling including resolve is already performed
|
|
267
259
|
if (this.stopProgress) {
|
|
268
260
|
return;
|
|
269
261
|
}
|
|
270
262
|
resolve(data);
|
|
271
|
-
}
|
|
272
|
-
|
|
263
|
+
}
|
|
264
|
+
onError(errorData, reject) {
|
|
273
265
|
this.handleError(errorData);
|
|
274
266
|
reject();
|
|
275
|
-
}
|
|
276
|
-
|
|
277
|
-
|
|
267
|
+
}
|
|
268
|
+
sendRequest(formData) {
|
|
269
|
+
let isPost = this.ajaxType != Const_1.REQ_TYPE_GET;
|
|
278
270
|
if (formData.isMultipartRequest) {
|
|
279
271
|
// in case of a multipart request we send in a formData object as body
|
|
280
272
|
this.xhrObject.send((isPost) ? formData.toFormData() : null);
|
|
@@ -283,32 +275,30 @@ var XhrRequest = /** @class */ (function () {
|
|
|
283
275
|
// in case of a normal request we send it normally
|
|
284
276
|
this.xhrObject.send((isPost) ? formData.toString() : null);
|
|
285
277
|
}
|
|
286
|
-
}
|
|
278
|
+
}
|
|
287
279
|
/*
|
|
288
280
|
* other helpers
|
|
289
281
|
*/
|
|
290
|
-
|
|
291
|
-
|
|
282
|
+
sendEvent(evtType) {
|
|
283
|
+
let eventData = EventData_1.EventData.createFromRequest(this.xhrObject, this.requestContext, evtType);
|
|
292
284
|
try {
|
|
293
285
|
// User code error, we might cover
|
|
294
286
|
// this in onError, but also we cannot swallow it.
|
|
295
287
|
// We need to resolve the local handlers lazily,
|
|
296
288
|
// because some frameworks might decorate them over the context in the response
|
|
297
|
-
|
|
289
|
+
let eventHandler = (0, RequestDataResolver_1.resolveHandlerFunc)(this.requestContext, this.responseContext, Const_1.ON_EVENT);
|
|
298
290
|
AjaxImpl_1.Implementation.sendEvent(eventData, eventHandler);
|
|
299
291
|
}
|
|
300
292
|
catch (e) {
|
|
301
293
|
this.handleError(e);
|
|
302
294
|
throw e;
|
|
303
295
|
}
|
|
304
|
-
}
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
var eventHandler = (0, RequestDataResolver_1.resolveHandlerFunc)(this.requestContext, this.responseContext, Const_1.ON_ERROR);
|
|
296
|
+
}
|
|
297
|
+
handleError(exception, responseFormatError = false) {
|
|
298
|
+
let errorData = (responseFormatError) ? ErrorData_1.ErrorData.fromHttpConnection(exception.source, exception.type, exception.status, exception.responseText, exception.responseCode, exception.status) : ErrorData_1.ErrorData.fromClient(exception);
|
|
299
|
+
let eventHandler = (0, RequestDataResolver_1.resolveHandlerFunc)(this.requestContext, this.responseContext, Const_1.ON_ERROR);
|
|
309
300
|
AjaxImpl_1.Implementation.sendError(errorData, eventHandler);
|
|
310
|
-
}
|
|
311
|
-
|
|
312
|
-
}());
|
|
301
|
+
}
|
|
302
|
+
}
|
|
313
303
|
exports.XhrRequest = XhrRequest;
|
|
314
304
|
//# 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,7 +58,7 @@ 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
|
}
|
|
@@ -75,33 +75,27 @@ var oam;
|
|
|
75
75
|
* @param target
|
|
76
76
|
* @param params
|
|
77
77
|
*/
|
|
78
|
-
oam.submitForm = function (formName, linkId, target, params) {
|
|
78
|
+
oam.submitForm = function (formName, linkId = null, target = null, params = {}) {
|
|
79
79
|
var _a, _b, _c, _d, _e, _f;
|
|
80
|
-
if (linkId === void 0) { linkId = null; }
|
|
81
|
-
if (target === void 0) { target = null; }
|
|
82
|
-
if (params === void 0) { params = {}; }
|
|
83
80
|
//handle a possible incoming null, not sure if this is used that way anywhere, but we allow it
|
|
84
81
|
params = (!params) ? {} : params;
|
|
85
|
-
|
|
82
|
+
let clearFn = 'clearFormHiddenParams_' + formName.replace(/-/g, '\$:').replace(/:/g, '_');
|
|
86
83
|
(_a = window === null || window === void 0 ? void 0 : window[clearFn]) === null || _a === void 0 ? void 0 : _a.call(window, formName);
|
|
87
84
|
//autoscroll code
|
|
88
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)) {
|
|
89
86
|
myfaces.oam.setHiddenInput(formName, 'autoScroll', window === null || window === void 0 ? void 0 : window.getScrolling());
|
|
90
87
|
}
|
|
91
|
-
|
|
92
|
-
paramsStream.each(
|
|
93
|
-
var key = _a[0], data = _a[1];
|
|
94
|
-
return myfaces.oam.setHiddenInput(formName, key, data);
|
|
95
|
-
});
|
|
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));
|
|
96
90
|
//we call the namespaced function, to allow decoration, via a direct call we would
|
|
97
|
-
myfaces.oam.setHiddenInput(formName,
|
|
98
|
-
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(
|
|
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 => {
|
|
99
93
|
var _a;
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
94
|
+
const ATTR_TARGET = "target";
|
|
95
|
+
const formElement = form.getAsElem(0).value;
|
|
96
|
+
const oldTarget = form.attr(ATTR_TARGET).value;
|
|
103
97
|
form.attr(ATTR_TARGET).value = target;
|
|
104
|
-
|
|
98
|
+
const result = (_a = formElement === null || formElement === void 0 ? void 0 : formElement.onsubmit) === null || _a === void 0 ? void 0 : _a.call(formElement, null);
|
|
105
99
|
try {
|
|
106
100
|
if ((!!result) || 'undefined' == typeof result) {
|
|
107
101
|
formElement.submit();
|
|
@@ -113,11 +107,10 @@ var oam;
|
|
|
113
107
|
finally {
|
|
114
108
|
form.attr(ATTR_TARGET).value = oldTarget;
|
|
115
109
|
// noinspection JSUnusedLocalSymbols
|
|
116
|
-
paramsStream.each(
|
|
117
|
-
var key = _a[0], data = _a[1];
|
|
110
|
+
paramsStream.each(([key, data]) => {
|
|
118
111
|
myfaces.oam.clearHiddenInput(formName, key);
|
|
119
112
|
});
|
|
120
|
-
myfaces.oam.clearHiddenInput(formName,
|
|
113
|
+
myfaces.oam.clearHiddenInput(formName, `${formName}:_idcl`);
|
|
121
114
|
}
|
|
122
115
|
});
|
|
123
116
|
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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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.window = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
const chai_1 = require("chai");
|
|
5
|
+
const mocha_1 = require("mocha");
|
|
6
|
+
const mona_dish_1 = require("mona-dish");
|
|
7
7
|
var equalsIgnoreCase = mona_dish_1.Lang.equalsIgnoreCase;
|
|
8
8
|
var assertType = mona_dish_1.Lang.assertType;
|
|
9
9
|
var objToArray = mona_dish_1.Lang.objToArray;
|
|
@@ -11,54 +11,68 @@ var isFunc = mona_dish_1.Lang.isFunc;
|
|
|
11
11
|
var isString = mona_dish_1.Lang.isString;
|
|
12
12
|
var trim = mona_dish_1.Lang.trim;
|
|
13
13
|
var strToArray = mona_dish_1.Lang.strToArray;
|
|
14
|
-
|
|
14
|
+
const Lang_1 = require("../../impl/util/Lang");
|
|
15
15
|
var keyValToStr = Lang_1.ExtLang.keyValToStr;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
const jsdom = require("jsdom");
|
|
17
|
+
const { JSDOM } = jsdom;
|
|
18
|
+
const dom = new JSDOM(`
|
|
19
|
+
<!DOCTYPE html>
|
|
20
|
+
<html lang="en">
|
|
21
|
+
<head>
|
|
22
|
+
<meta charset="UTF-8">
|
|
23
|
+
<title>Title</title>
|
|
24
|
+
</head>
|
|
25
|
+
<body>
|
|
26
|
+
<div />
|
|
27
|
+
<div />
|
|
28
|
+
<div />
|
|
29
|
+
<div />
|
|
30
|
+
</body>
|
|
31
|
+
</html>
|
|
32
|
+
|
|
33
|
+
`);
|
|
19
34
|
exports.window = dom.window;
|
|
20
35
|
function hello_world() {
|
|
21
36
|
return "Hello World!";
|
|
22
37
|
}
|
|
23
|
-
(0, mocha_1.describe)('Hello World!',
|
|
24
|
-
before(
|
|
38
|
+
(0, mocha_1.describe)('Hello World!', () => {
|
|
39
|
+
before(() => {
|
|
25
40
|
global.window = exports.window;
|
|
26
41
|
global.document = exports.window.document;
|
|
27
42
|
global.navigator = {
|
|
28
43
|
language: "en-En"
|
|
29
44
|
};
|
|
30
45
|
});
|
|
31
|
-
(0, mocha_1.it)('first test',
|
|
32
|
-
|
|
46
|
+
(0, mocha_1.it)('first test', () => {
|
|
47
|
+
const result = hello_world();
|
|
33
48
|
(0, chai_1.expect)(result).to.equal('Hello World!');
|
|
34
49
|
});
|
|
35
50
|
});
|
|
36
|
-
|
|
37
|
-
|
|
51
|
+
class Probe {
|
|
52
|
+
constructor() {
|
|
38
53
|
this.val1 = 1;
|
|
39
54
|
this.val2 = 2;
|
|
40
55
|
this.val3 = 3;
|
|
41
56
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
(0, mocha_1.
|
|
45
|
-
|
|
46
|
-
var lang = mona_dish_1.Lang;
|
|
57
|
+
}
|
|
58
|
+
(0, mocha_1.describe)('Lang tests', () => {
|
|
59
|
+
(0, mocha_1.it)('initializable', () => {
|
|
60
|
+
const lang = mona_dish_1.Lang;
|
|
47
61
|
(0, chai_1.expect)(lang).to.exist;
|
|
48
62
|
});
|
|
49
|
-
(0, mocha_1.it)('strToArray working',
|
|
50
|
-
|
|
63
|
+
(0, mocha_1.it)('strToArray working', () => {
|
|
64
|
+
let arr = strToArray("hello.world.from.me", /\./gi);
|
|
51
65
|
(0, chai_1.expect)(arr).to.exist;
|
|
52
66
|
(0, chai_1.expect)(arr.length).to.eq(4);
|
|
53
67
|
(0, chai_1.expect)(arr[3]).to.eq("me");
|
|
54
68
|
});
|
|
55
|
-
(0, mocha_1.it)('trim working',
|
|
56
|
-
|
|
57
|
-
|
|
69
|
+
(0, mocha_1.it)('trim working', () => {
|
|
70
|
+
let origStr = " hello world from me ";
|
|
71
|
+
let trimmed = trim(origStr);
|
|
58
72
|
(0, chai_1.expect)(trimmed).to.exist;
|
|
59
73
|
(0, chai_1.expect)(trimmed).to.eq("hello world from me");
|
|
60
74
|
});
|
|
61
|
-
(0, mocha_1.it)('isString working',
|
|
75
|
+
(0, mocha_1.it)('isString working', () => {
|
|
62
76
|
(0, chai_1.expect)(isString(" ")).to.be.true;
|
|
63
77
|
(0, chai_1.expect)(isString('')).to.be.true;
|
|
64
78
|
(0, chai_1.expect)(isString(null)).to.be.false;
|
|
@@ -68,8 +82,8 @@ var Probe = /** @class */ (function () {
|
|
|
68
82
|
})).to.be.false;
|
|
69
83
|
(0, chai_1.expect)(isString(new Probe())).to.be.false;
|
|
70
84
|
});
|
|
71
|
-
(0, mocha_1.it)('isFunc working',
|
|
72
|
-
(0, chai_1.expect)(isFunc(
|
|
85
|
+
(0, mocha_1.it)('isFunc working', () => {
|
|
86
|
+
(0, chai_1.expect)(isFunc(() => {
|
|
73
87
|
})).to.be.true;
|
|
74
88
|
(0, chai_1.expect)(isFunc(function () {
|
|
75
89
|
return true;
|
|
@@ -77,9 +91,9 @@ var Probe = /** @class */ (function () {
|
|
|
77
91
|
(0, chai_1.expect)(isFunc("blarg")).to.be.false;
|
|
78
92
|
(0, chai_1.expect)(isFunc(new Probe())).to.be.false;
|
|
79
93
|
});
|
|
80
|
-
(0, mocha_1.it)('objToArray working',
|
|
81
|
-
|
|
82
|
-
|
|
94
|
+
(0, mocha_1.it)('objToArray working', () => {
|
|
95
|
+
let obj_probe = new Probe();
|
|
96
|
+
let resultArr = objToArray(obj_probe);
|
|
83
97
|
(0, chai_1.expect)(assertType(resultArr, Array)).to.be.true;
|
|
84
98
|
(0, chai_1.expect)(resultArr.length).to.eq(0);
|
|
85
99
|
obj_probe = exports.window.document.body.querySelectorAll("div");
|
|
@@ -87,11 +101,11 @@ var Probe = /** @class */ (function () {
|
|
|
87
101
|
(0, chai_1.expect)(resultArr.length).to.eq(4);
|
|
88
102
|
(0, chai_1.expect)(assertType(resultArr, Array)).to.be.true;
|
|
89
103
|
});
|
|
90
|
-
(0, mocha_1.it)('keyval to string working',
|
|
91
|
-
|
|
104
|
+
(0, mocha_1.it)('keyval to string working', () => {
|
|
105
|
+
let keyval = keyValToStr("key", "val", ":");
|
|
92
106
|
(0, chai_1.expect)(keyval).to.eq("key:val");
|
|
93
107
|
});
|
|
94
|
-
(0, mocha_1.it)('equals ignore case test',
|
|
108
|
+
(0, mocha_1.it)('equals ignore case test', () => {
|
|
95
109
|
(0, chai_1.expect)(equalsIgnoreCase(null, null)).to.be.true;
|
|
96
110
|
(0, chai_1.expect)(equalsIgnoreCase("", "")).to.be.true;
|
|
97
111
|
(0, chai_1.expect)(equalsIgnoreCase("null", "NuLL")).to.be.true;
|