jsf.js_next_gen 4.0.1-beta.1 → 4.0.1-beta.3
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/README.md +6 -0
- package/dist/docs/assets/search.js +1 -1
- package/dist/docs/functions/myfaces.ab.html +1 -1
- package/dist/docs/functions/{myfaces.onOnDomReady.html → myfaces.onDomReady.html} +5 -5
- package/dist/docs/index.html +9 -0
- package/dist/docs/modules/myfaces.html +2 -2
- package/dist/docs/variables/myfaces.oam.html +1 -1
- package/dist/window/faces-development.js +1285 -1295
- 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 +1285 -1295
- 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 +5 -5
- package/plans for 4.0.1.txt +8 -0
- package/src/main/typescript/api/_api.ts +1 -1
- package/src/main/typescript/impl/AjaxImpl.ts +60 -44
- package/src/main/typescript/impl/core/Const.ts +5 -2
- package/src/main/typescript/impl/util/AsyncRunnable.ts +81 -6
- package/src/main/typescript/impl/util/ExtDomQuery.ts +7 -9
- package/src/main/typescript/impl/util/FileUtils.ts +26 -22
- package/src/main/typescript/impl/util/HiddenInputBuilder.ts +7 -3
- package/src/main/typescript/impl/util/Lang.ts +61 -4
- package/src/main/typescript/impl/util/XhrQueueController.ts +112 -0
- package/src/main/typescript/impl/xhrCore/EventData.ts +3 -3
- package/src/main/typescript/impl/xhrCore/ResponseProcessor.ts +12 -10
- package/src/main/typescript/impl/xhrCore/XhrFormData.ts +32 -19
- package/src/main/typescript/impl/xhrCore/XhrRequest.ts +51 -72
- package/src/main/typescript/myfaces/OamSubmit.ts +6 -6
- package/src/main/typescript/test/frameworkBase/_ext/monadish/DomQueryTest.spec.ts +179 -40
- package/src/main/typescript/test/frameworkBase/_ext/monadish/MonadTest.spec.ts +4 -4
- package/src/main/typescript/test/frameworkBase/_ext/monadish/fixtures/blank.css +0 -0
- package/src/main/typescript/test/frameworkBase/_ext/monadish/markups/tobago-with-header.ts +921 -0
- package/src/main/typescript/test/frameworkBase/_ext/monadish/markups/tobago-without-header.ts +108 -0
- package/src/main/typescript/test/frameworkBase/_ext/shared/StandardInits.ts +3 -2
- package/src/main/typescript/test/frameworkBase/_ext/shared/fixtures/jakarta.faces.resource/faces.js.jsf +0 -0
- package/src/main/typescript/test/myfaces/OnLoadSpec.ts +52 -0
- package/src/main/typescript/test/queue/AsynchronousProbe.ts +5 -5
- package/src/main/typescript/test/queue/AsynchronousQueueTest.spec.ts +4 -3
- package/src/main/typescript/test/xhrCore/EventTests.spec.ts +28 -22
- package/src/main/typescript/test/xhrCore/NamespacesRequestTest.spec.ts +4 -4
- package/src/main/typescript/test/xhrCore/RequestParamsTest.spec.ts +2 -2
- package/src/main/typescript/test/xhrCore/RequestTest.spec.ts +80 -6
- package/src/main/typescript/test/xhrCore/RequestTest_23.spec.ts +6 -1
- package/src/main/typescript/test/xhrCore/ResponseTest.spec.ts +23 -22
- package/target/api/_api.js +2 -2
- package/target/api/_api.js.map +1 -1
- package/target/impl/AjaxImpl.js +48 -38
- package/target/impl/AjaxImpl.js.map +1 -1
- package/target/impl/core/Const.js +7 -5
- package/target/impl/core/Const.js.map +1 -1
- package/target/impl/util/AsyncRunnable.js +60 -0
- package/target/impl/util/AsyncRunnable.js.map +1 -1
- package/target/impl/util/ExtDomQuery.js +8 -8
- package/target/impl/util/ExtDomQuery.js.map +1 -1
- package/target/impl/util/FileUtils.js +21 -20
- package/target/impl/util/FileUtils.js.map +1 -1
- package/target/impl/util/HiddenInputBuilder.js +7 -3
- package/target/impl/util/HiddenInputBuilder.js.map +1 -1
- package/target/impl/util/Lang.js +52 -1
- package/target/impl/util/Lang.js.map +1 -1
- package/target/impl/xhrCore/EventData.js +2 -2
- package/target/impl/xhrCore/EventData.js.map +1 -1
- package/target/impl/xhrCore/ResponseProcessor.js +9 -7
- package/target/impl/xhrCore/ResponseProcessor.js.map +1 -1
- package/target/impl/xhrCore/XhrFormData.js +29 -15
- package/target/impl/xhrCore/XhrFormData.js.map +1 -1
- package/target/impl/xhrCore/XhrRequest.js +43 -64
- package/target/impl/xhrCore/XhrRequest.js.map +1 -1
- package/target/myfaces/OamSubmit.js +5 -3
- package/target/myfaces/OamSubmit.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/DomQueryTest.spec.js +138 -37
- package/target/test/frameworkBase/_ext/monadish/DomQueryTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/MonadTest.spec.js +4 -4
- package/target/test/frameworkBase/_ext/monadish/MonadTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/shared/StandardInits.js +3 -2
- package/target/test/frameworkBase/_ext/shared/StandardInits.js.map +1 -1
- package/target/test/queue/AsynchronousQueueTest.spec.js +3 -3
- package/target/test/queue/AsynchronousQueueTest.spec.js.map +1 -1
- package/target/test/xhrCore/EventTests.spec.js +26 -19
- package/target/test/xhrCore/EventTests.spec.js.map +1 -1
- package/target/test/xhrCore/NamespacesRequestTest.spec.js +3 -3
- package/target/test/xhrCore/NamespacesRequestTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestParamsTest.spec.js +1 -1
- package/target/test/xhrCore/RequestParamsTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestTest.spec.js +73 -4
- package/target/test/xhrCore/RequestTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestTest_23.spec.js +6 -0
- package/target/test/xhrCore/RequestTest_23.spec.js.map +1 -1
- package/target/test/xhrCore/ResponseTest.spec.js +22 -15
- package/target/test/xhrCore/ResponseTest.spec.js.map +1 -1
- package/src/main/typescript/impl/util/AsyncQueue.ts +0 -133
- package/src/main/typescript/test/frameworkBase/_ext/monadish/StreamTest.spec.ts +0 -231
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.XhrRequest = void 0;
|
|
19
|
+
const AsyncRunnable_1 = require("../util/AsyncRunnable");
|
|
19
20
|
const mona_dish_1 = require("mona-dish");
|
|
20
21
|
const AjaxImpl_1 = require("../AjaxImpl");
|
|
21
22
|
const XhrFormData_1 = require("./XhrFormData");
|
|
@@ -28,6 +29,10 @@ var failSaveExecute = Lang_1.ExtLang.failSaveExecute;
|
|
|
28
29
|
/**
|
|
29
30
|
* Faces XHR Request Wrapper
|
|
30
31
|
* as AsyncRunnable for our Asynchronous queue
|
|
32
|
+
* This means from the outside the
|
|
33
|
+
* xhr request is similar to a Promise in a way
|
|
34
|
+
* that you can add then and catch and finally callbacks.
|
|
35
|
+
*
|
|
31
36
|
*
|
|
32
37
|
* The idea is that we basically just enqueue
|
|
33
38
|
* a single ajax request into our queue
|
|
@@ -35,51 +40,35 @@ var failSaveExecute = Lang_1.ExtLang.failSaveExecute;
|
|
|
35
40
|
*
|
|
36
41
|
*
|
|
37
42
|
*/
|
|
38
|
-
class XhrRequest {
|
|
43
|
+
class XhrRequest extends AsyncRunnable_1.AsyncRunnable {
|
|
39
44
|
/**
|
|
40
45
|
* Required Parameters
|
|
41
46
|
*
|
|
42
|
-
* @param source the issuing element
|
|
43
|
-
* @param sourceForm the form which is related to the issuing element
|
|
44
47
|
* @param requestContext the request context with all pass through values
|
|
45
|
-
*
|
|
46
|
-
* Optional Parameters
|
|
47
|
-
*
|
|
48
48
|
* @param internalContext internal context with internal info which is passed through, not used by the user
|
|
49
|
-
*
|
|
49
|
+
* Optional Parameters
|
|
50
50
|
* @param timeout optional xhr timeout
|
|
51
51
|
* @param ajaxType optional request type, default "POST"
|
|
52
52
|
* @param contentType optional content type, default "application/x-www-form-urlencoded"
|
|
53
|
-
* @param xhrObject optional xhr object which must fulfill the XMLHTTPRequest api, default XMLHttpRequest
|
|
54
53
|
*/
|
|
55
|
-
constructor(
|
|
56
|
-
|
|
57
|
-
this.sourceForm = sourceForm;
|
|
54
|
+
constructor(requestContext, internalContext, timeout = Const_1.NO_TIMEOUT, ajaxType = Const_1.REQ_TYPE_POST, contentType = Const_1.URL_ENCODED) {
|
|
55
|
+
super();
|
|
58
56
|
this.requestContext = requestContext;
|
|
59
57
|
this.internalContext = internalContext;
|
|
60
|
-
this.partialIdsArray = partialIdsArray;
|
|
61
58
|
this.timeout = timeout;
|
|
62
59
|
this.ajaxType = ajaxType;
|
|
63
60
|
this.contentType = contentType;
|
|
64
|
-
this.xhrObject = xhrObject;
|
|
65
61
|
this.stopProgress = false;
|
|
66
|
-
|
|
67
|
-
* helper support so that we do not have to drag in Promise shims
|
|
68
|
-
*/
|
|
69
|
-
this.catchFunctions = [];
|
|
70
|
-
this.thenFunctions = [];
|
|
62
|
+
this.xhrObject = new XMLHttpRequest();
|
|
71
63
|
// we omit promises here because we have to deal with cancel functionality,
|
|
72
64
|
// and promises to not provide that (yet) instead we have our async queue
|
|
73
65
|
// which uses an api internally, which is very close to promises
|
|
74
|
-
this.registerXhrCallbacks((data) =>
|
|
75
|
-
this.resolve(data);
|
|
76
|
-
}, (data) => {
|
|
77
|
-
this.reject(data);
|
|
78
|
-
});
|
|
66
|
+
this.registerXhrCallbacks((data) => this.resolve(data), (data) => this.reject(data));
|
|
79
67
|
}
|
|
80
68
|
start() {
|
|
81
69
|
let ignoreErr = failSaveExecute;
|
|
82
70
|
let xhrObject = this.xhrObject;
|
|
71
|
+
let sourceForm = mona_dish_1.DQ.byId(this.internalContext.getIf(Const_1.CTX_PARAM_SRC_FRM_ID).value);
|
|
83
72
|
let executesArr = () => {
|
|
84
73
|
return this.requestContext.getIf(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_EXECUTE).get(Const_1.IDENT_NONE).value.split(/\s+/gi);
|
|
85
74
|
};
|
|
@@ -92,13 +81,14 @@ class XhrRequest {
|
|
|
92
81
|
// whatever the formData object delivers
|
|
93
82
|
// the partialIdsArray arr is almost deprecated legacy code where we allowed to send a separate list of partial
|
|
94
83
|
// ids for reduced load and server processing, this will be removed soon, we can handle the same via execute
|
|
95
|
-
|
|
96
|
-
|
|
84
|
+
const executes = executesArr();
|
|
85
|
+
const partialIdsArray = this.internalContext.getIf(Const_1.CTX_PARAM_PPS).value === true ? executes : [];
|
|
86
|
+
const formData = new XhrFormData_1.XhrFormData(sourceForm, (0, RequestDataResolver_1.resoveNamingContainerMapper)(this.internalContext), executes, partialIdsArray);
|
|
97
87
|
this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
|
|
98
88
|
// next step the pass through parameters are merged in for post params
|
|
99
89
|
this.requestContext.$nspEnabled = false;
|
|
100
|
-
|
|
101
|
-
|
|
90
|
+
const requestContext = this.requestContext;
|
|
91
|
+
const requestPassThroughParams = requestContext.getIf(Const_1.CTX_PARAM_REQ_PASS_THR);
|
|
102
92
|
// we are turning off here the jsf, faces remapping because we are now dealing with
|
|
103
93
|
// pass-through parameters
|
|
104
94
|
requestPassThroughParams.$nspEnabled = false;
|
|
@@ -109,17 +99,20 @@ class XhrRequest {
|
|
|
109
99
|
formData.shallowMerge(requestPassThroughParams, true, true);
|
|
110
100
|
}
|
|
111
101
|
finally {
|
|
102
|
+
// unfortunately as long as we support
|
|
103
|
+
// both namespaces we have to keep manual control
|
|
104
|
+
// on the key renaming before doing ops like deep copy
|
|
112
105
|
this.requestContext.$nspEnabled = true;
|
|
113
106
|
requestPassThroughParams.$nspEnabled = true;
|
|
114
107
|
}
|
|
115
108
|
this.responseContext = requestPassThroughParams.deepCopy;
|
|
116
109
|
// we have to shift the internal passthroughs around to build up our response context
|
|
117
|
-
|
|
110
|
+
const responseContext = this.responseContext;
|
|
118
111
|
responseContext.assign(Const_1.CTX_PARAM_MF_INTERNAL).value = this.internalContext.value;
|
|
119
|
-
// per spec the
|
|
112
|
+
// per spec the onEvent and onError handlers must be passed through to the response
|
|
120
113
|
responseContext.assign(Const_1.ON_EVENT).value = requestContext.getIf(Const_1.ON_EVENT).value;
|
|
121
114
|
responseContext.assign(Const_1.ON_ERROR).value = requestContext.getIf(Const_1.ON_ERROR).value;
|
|
122
|
-
xhrObject.open(this.ajaxType, (0, RequestDataResolver_1.resolveFinalUrl)(
|
|
115
|
+
xhrObject.open(this.ajaxType, (0, RequestDataResolver_1.resolveFinalUrl)(sourceForm, formData, this.ajaxType), true);
|
|
123
116
|
// adding timeout
|
|
124
117
|
this.timeout ? xhrObject.timeout = this.timeout : null;
|
|
125
118
|
// a bug in the xhr stub library prevents the setRequestHeader to be properly executed on fake xhr objects
|
|
@@ -144,36 +137,14 @@ class XhrRequest {
|
|
|
144
137
|
}
|
|
145
138
|
cancel() {
|
|
146
139
|
try {
|
|
140
|
+
// this causes onError to be called where the error
|
|
141
|
+
// handling takes over
|
|
147
142
|
this.xhrObject.abort();
|
|
148
143
|
}
|
|
149
144
|
catch (e) {
|
|
150
145
|
this.handleError(e);
|
|
151
146
|
}
|
|
152
147
|
}
|
|
153
|
-
resolve(data) {
|
|
154
|
-
mona_dish_1.Stream.of(...this.thenFunctions).reduce((inputVal, thenFunc) => {
|
|
155
|
-
return thenFunc(inputVal);
|
|
156
|
-
}, data);
|
|
157
|
-
}
|
|
158
|
-
reject(data) {
|
|
159
|
-
mona_dish_1.Stream.of(...this.catchFunctions).reduce((inputVal, catchFunc) => {
|
|
160
|
-
return catchFunc(inputVal);
|
|
161
|
-
}, data);
|
|
162
|
-
}
|
|
163
|
-
catch(func) {
|
|
164
|
-
this.catchFunctions.push(func);
|
|
165
|
-
return this;
|
|
166
|
-
}
|
|
167
|
-
finally(func) {
|
|
168
|
-
// no ie11 support we probably are going to revert to shims for that one
|
|
169
|
-
this.catchFunctions.push(func);
|
|
170
|
-
this.thenFunctions.push(func);
|
|
171
|
-
return this;
|
|
172
|
-
}
|
|
173
|
-
then(func) {
|
|
174
|
-
this.thenFunctions.push(func);
|
|
175
|
-
return this;
|
|
176
|
-
}
|
|
177
148
|
/**
|
|
178
149
|
* attaches the internal event and processing
|
|
179
150
|
* callback within the promise to our xhr object
|
|
@@ -182,7 +153,7 @@ class XhrRequest {
|
|
|
182
153
|
* @param reject
|
|
183
154
|
*/
|
|
184
155
|
registerXhrCallbacks(resolve, reject) {
|
|
185
|
-
|
|
156
|
+
const xhrObject = this.xhrObject;
|
|
186
157
|
xhrObject.onabort = () => {
|
|
187
158
|
this.onAbort(reject);
|
|
188
159
|
};
|
|
@@ -196,13 +167,17 @@ class XhrRequest {
|
|
|
196
167
|
this.onDone(this.xhrObject, resolve);
|
|
197
168
|
};
|
|
198
169
|
xhrObject.onerror = (errorData) => {
|
|
199
|
-
// some browsers trigger an error when cancelling a request internally
|
|
170
|
+
// some browsers trigger an error when cancelling a request internally, or when
|
|
171
|
+
// cancel is called from outside
|
|
200
172
|
// in this case we simply ignore the request and clear up the queue, because
|
|
201
173
|
// it is not safe anymore to proceed with the current queue
|
|
202
174
|
// This bypasses a Safari issue where it keeps requests hanging after page unload
|
|
203
175
|
// and then triggers a cancel error on then instead of just stopping
|
|
204
176
|
// and clearing the code
|
|
205
177
|
if (this.isCancelledResponse(this.xhrObject)) {
|
|
178
|
+
/*
|
|
179
|
+
* this triggers the catch chain and after that finally
|
|
180
|
+
*/
|
|
206
181
|
reject();
|
|
207
182
|
this.stopProgress = true;
|
|
208
183
|
return;
|
|
@@ -243,14 +218,12 @@ class XhrRequest {
|
|
|
243
218
|
handleMalFormedXML(resolve) {
|
|
244
219
|
var _a;
|
|
245
220
|
this.stopProgress = true;
|
|
246
|
-
|
|
221
|
+
const errorData = {
|
|
247
222
|
type: Const_1.ERROR,
|
|
248
223
|
status: Const_1.MALFORMEDXML,
|
|
249
224
|
responseCode: 200,
|
|
250
225
|
responseText: (_a = this.xhrObject) === null || _a === void 0 ? void 0 : _a.responseText,
|
|
251
|
-
|
|
252
|
-
// it will be unremapped
|
|
253
|
-
source: this.source.id.value
|
|
226
|
+
source: this.internalContext.getIf(Const_1.CTX_PARAM_SRC_CTL_ID).value
|
|
254
227
|
};
|
|
255
228
|
try {
|
|
256
229
|
this.handleError(errorData, true);
|
|
@@ -267,14 +240,20 @@ class XhrRequest {
|
|
|
267
240
|
if (this.stopProgress) {
|
|
268
241
|
return;
|
|
269
242
|
}
|
|
243
|
+
/**
|
|
244
|
+
* now call the then chain
|
|
245
|
+
*/
|
|
270
246
|
resolve(data);
|
|
271
247
|
}
|
|
272
248
|
onError(errorData, reject) {
|
|
273
249
|
this.handleError(errorData);
|
|
250
|
+
/*
|
|
251
|
+
* this triggers the catch chain and after that finally
|
|
252
|
+
*/
|
|
274
253
|
reject();
|
|
275
254
|
}
|
|
276
255
|
sendRequest(formData) {
|
|
277
|
-
|
|
256
|
+
const isPost = this.ajaxType != Const_1.REQ_TYPE_GET;
|
|
278
257
|
if (formData.isMultipartRequest) {
|
|
279
258
|
// in case of a multipart request we send in a formData object as body
|
|
280
259
|
this.xhrObject.send((isPost) ? formData.toFormData() : null);
|
|
@@ -289,7 +268,7 @@ class XhrRequest {
|
|
|
289
268
|
*/
|
|
290
269
|
sendEvent(evtType) {
|
|
291
270
|
var _a;
|
|
292
|
-
|
|
271
|
+
const eventData = EventData_1.EventData.createFromRequest(this.xhrObject, this.requestContext, evtType);
|
|
293
272
|
try {
|
|
294
273
|
// User code error, we might cover
|
|
295
274
|
// this in onError, but also we cannot swallow it.
|
|
@@ -305,8 +284,8 @@ class XhrRequest {
|
|
|
305
284
|
}
|
|
306
285
|
}
|
|
307
286
|
handleError(exception, responseFormatError = false) {
|
|
308
|
-
|
|
309
|
-
|
|
287
|
+
const errorData = (responseFormatError) ? ErrorData_1.ErrorData.fromHttpConnection(exception.source, exception.type, exception.status, exception.responseText, exception.responseCode, exception.status) : ErrorData_1.ErrorData.fromClient(exception);
|
|
288
|
+
const eventHandler = (0, RequestDataResolver_1.resolveHandlerFunc)(this.requestContext, this.responseContext, Const_1.ON_ERROR);
|
|
310
289
|
AjaxImpl_1.Implementation.sendError(errorData, eventHandler);
|
|
311
290
|
}
|
|
312
291
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XhrRequest.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/XhrRequest.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;
|
|
1
|
+
{"version":3,"file":"XhrRequest.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/XhrRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.oam = void 0;
|
|
19
19
|
const mona_dish_1 = require("mona-dish");
|
|
20
|
+
const Lang_1 = require("../impl/util/Lang");
|
|
20
21
|
/**
|
|
21
22
|
* legacy code to enable various aspects
|
|
22
23
|
* of myfaces, used to be rendered inline
|
|
@@ -30,6 +31,7 @@ const mona_dish_1 = require("mona-dish");
|
|
|
30
31
|
*/
|
|
31
32
|
var oam;
|
|
32
33
|
(function (oam) {
|
|
34
|
+
var ofAssoc = Lang_1.ExtLang.ofAssoc;
|
|
33
35
|
/**
|
|
34
36
|
* sets a hidden input field
|
|
35
37
|
* @param formName the formName
|
|
@@ -85,8 +87,8 @@ var oam;
|
|
|
85
87
|
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)) {
|
|
86
88
|
myfaces.oam.setHiddenInput(formName, 'autoScroll', window === null || window === void 0 ? void 0 : window.getScrolling());
|
|
87
89
|
}
|
|
88
|
-
let paramsStream = Array.isArray(params) ?
|
|
89
|
-
paramsStream.
|
|
90
|
+
let paramsStream = Array.isArray(params) ? [...params] : ofAssoc(params);
|
|
91
|
+
paramsStream.forEach(([key, data]) => myfaces.oam.setHiddenInput(formName, key, data));
|
|
90
92
|
//we call the namespaced function, to allow decoration, via a direct call we would
|
|
91
93
|
myfaces.oam.setHiddenInput(formName, `${formName}:_idcl`, linkId !== null && linkId !== void 0 ? linkId : '');
|
|
92
94
|
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 => {
|
|
@@ -114,7 +116,7 @@ var oam;
|
|
|
114
116
|
form.getAsElem(0).value.setAttribute("target", oldTarget);
|
|
115
117
|
}
|
|
116
118
|
// noinspection JSUnusedLocalSymbols
|
|
117
|
-
paramsStream.
|
|
119
|
+
paramsStream.forEach(([key, data]) => {
|
|
118
120
|
myfaces.oam.clearHiddenInput(formName, key);
|
|
119
121
|
});
|
|
120
122
|
myfaces.oam.clearHiddenInput(formName, `${formName}:_idcl`);
|
|
@@ -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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"}
|