jsf.js_next_gen 4.0.3-beta.3 → 4.0.3-beta.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/window/faces-development.js +12 -6
- package/dist/window/faces-development.js.map +1 -1
- package/dist/window/faces.js +1 -1
- package/dist/window/faces.js.map +1 -1
- package/dist/window/jsf-development.js +12 -6
- package/dist/window/jsf-development.js.map +1 -1
- package/dist/window/jsf.js +1 -1
- package/dist/window/jsf.js.map +1 -1
- package/package.json +2 -2
- package/src/main/typescript/impl/util/Lang.ts +12 -8
- package/target/impl/util/Lang.js +11 -5
- package/target/impl/util/Lang.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "jsf.js_next_gen",
|
|
3
|
-
"version": "4.0.3-beta.
|
|
3
|
+
"version": "4.0.3-beta.5",
|
|
4
4
|
"description": "A next generation typescript reimplementation of jsf.js",
|
|
5
5
|
"main": "dist/window/faces.js",
|
|
6
6
|
"scripts": {
|
|
@@ -48,6 +48,6 @@
|
|
|
48
48
|
"webpack-dev-server": "^4.15.1"
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"mona-dish": "0.28.
|
|
51
|
+
"mona-dish": "0.28.12"
|
|
52
52
|
}
|
|
53
53
|
}
|
|
@@ -174,13 +174,20 @@ export module ExtLang {
|
|
|
174
174
|
}
|
|
175
175
|
}
|
|
176
176
|
|
|
177
|
+
//no direct form is found we look for parent/child relationships as fallback
|
|
178
|
+
//(90% case)
|
|
177
179
|
let form = queryElem.firstParent(HTML_TAG_FORM)
|
|
178
180
|
.orElseLazy(() => queryElem.byTagName(HTML_TAG_FORM, true))
|
|
179
181
|
.orElseLazy(() => eventTarget.firstParent(HTML_TAG_FORM))
|
|
180
182
|
.orElseLazy(() => eventTarget.byTagName(HTML_TAG_FORM))
|
|
181
183
|
.first();
|
|
182
184
|
|
|
183
|
-
|
|
185
|
+
//either a form is found within parent child - nearest form (aka first)
|
|
186
|
+
//or we look for a single form
|
|
187
|
+
form = form.orElseLazy(() => DQ.byTagName(HTML_TAG_FORM));
|
|
188
|
+
|
|
189
|
+
//the end result must be a found form otherwise - Exception
|
|
190
|
+
assertOnlyOneFormExists(form);
|
|
184
191
|
|
|
185
192
|
return form;
|
|
186
193
|
}
|
|
@@ -257,17 +264,14 @@ export module ExtLang {
|
|
|
257
264
|
}
|
|
258
265
|
}
|
|
259
266
|
|
|
260
|
-
|
|
261
267
|
/**
|
|
262
|
-
* assert that the form exists and throw an exception in the case it does not
|
|
268
|
+
* assert that the form exists and only one form exists and throw an exception in the case it does not
|
|
263
269
|
*
|
|
264
|
-
* @param
|
|
270
|
+
* @param forms the form to check for
|
|
265
271
|
*/
|
|
266
|
-
function
|
|
267
|
-
if (
|
|
272
|
+
function assertOnlyOneFormExists(forms: DomQuery): void | never {
|
|
273
|
+
if (forms.isAbsent() || forms.length > 1) {
|
|
268
274
|
throw makeException(new Error(), null, null, "Impl", "getForm", getMessage("ERR_FORM"));
|
|
269
275
|
}
|
|
270
276
|
}
|
|
271
|
-
|
|
272
|
-
|
|
273
277
|
}
|
package/target/impl/util/Lang.js
CHANGED
|
@@ -167,12 +167,18 @@ var ExtLang;
|
|
|
167
167
|
return foundForm;
|
|
168
168
|
}
|
|
169
169
|
}
|
|
170
|
+
//no direct form is found we look for parent/child relationships as fallback
|
|
171
|
+
//(90% case)
|
|
170
172
|
let form = queryElem.firstParent(Const_1.HTML_TAG_FORM)
|
|
171
173
|
.orElseLazy(() => queryElem.byTagName(Const_1.HTML_TAG_FORM, true))
|
|
172
174
|
.orElseLazy(() => eventTarget.firstParent(Const_1.HTML_TAG_FORM))
|
|
173
175
|
.orElseLazy(() => eventTarget.byTagName(Const_1.HTML_TAG_FORM))
|
|
174
176
|
.first();
|
|
175
|
-
|
|
177
|
+
//either a form is found within parent child - nearest form (aka first)
|
|
178
|
+
//or we look for a single form
|
|
179
|
+
form = form.orElseLazy(() => mona_dish_1.DQ.byTagName(Const_1.HTML_TAG_FORM));
|
|
180
|
+
//the end result must be a found form otherwise - Exception
|
|
181
|
+
assertOnlyOneFormExists(form);
|
|
176
182
|
return form;
|
|
177
183
|
}
|
|
178
184
|
ExtLang.getForm = getForm;
|
|
@@ -245,12 +251,12 @@ var ExtLang;
|
|
|
245
251
|
}
|
|
246
252
|
ExtLang.debounce = debounce;
|
|
247
253
|
/**
|
|
248
|
-
* assert that the form exists and throw an exception in the case it does not
|
|
254
|
+
* assert that the form exists and only one form exists and throw an exception in the case it does not
|
|
249
255
|
*
|
|
250
|
-
* @param
|
|
256
|
+
* @param forms the form to check for
|
|
251
257
|
*/
|
|
252
|
-
function
|
|
253
|
-
if (
|
|
258
|
+
function assertOnlyOneFormExists(forms) {
|
|
259
|
+
if (forms.isAbsent() || forms.length > 1) {
|
|
254
260
|
throw makeException(new Error(), null, null, "Impl", "getForm", getMessage("ERR_FORM"));
|
|
255
261
|
}
|
|
256
262
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Lang.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/util/Lang.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAEH,yCAA2E;AAC3E,+CAA0C;AAC1C,yCAAuD;AACvD,wEAA8D;AAC9D,yCAAsC;AAGtC,IAAc,OAAO,
|
|
1
|
+
{"version":3,"file":"Lang.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/util/Lang.ts"],"names":[],"mappings":"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"}
|