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