This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch feature/coffeescript-to-typescript
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to
refs/heads/feature/coffeescript-to-typescript by this push:
new e125a6e54 TAP5-2804: test JS fixes plus TS conversion fixes
e125a6e54 is described below
commit e125a6e548e5d5777e12ab133237dba16388321e
Author: Thiago H. de Paula Figueiredo <[email protected]>
AuthorDate: Mon May 26 22:29:38 2025 -0300
TAP5-2804: test JS fixes plus TS conversion fixes
---
.../src/main/typescript/src/t5/core/alert.ts | 3 +--
.../src/main/typescript/src/t5/core/autocomplete.ts | 12 ++++++++----
.../src/main/typescript/src/t5/core/messages-amd.ts | 2 +-
.../src/main/typescript/src/t5/core/utils.ts | 4 +++-
.../META-INF/assets/ExpressionInJsFunction.js | 2 ++
.../resources/META-INF/assets/PublishEventDemo.js | 3 +++
.../test/resources/META-INF/modules/palette-demo.js | 19 +++++++++++++------
7 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/tapestry-core/src/main/typescript/src/t5/core/alert.ts
b/tapestry-core/src/main/typescript/src/t5/core/alert.ts
index d381e0b2c..fd45f4715 100644
--- a/tapestry-core/src/main/typescript/src/t5/core/alert.ts
+++ b/tapestry-core/src/main/typescript/src/t5/core/alert.ts
@@ -26,7 +26,6 @@ import _ from "underscore";
import bootstrap from "t5/core/bootstrap";
const TRANSIENT_DURATION = 5000;
-let exports_;
const severityToClass: { [key: string]: string } = {
info: "alert-info",
success: "alert-success",
@@ -174,4 +173,4 @@ ${content}\
alert.TRANSIENT_DURATION = TRANSIENT_DURATION;
-export default exports_;
+export default alert;
diff --git a/tapestry-core/src/main/typescript/src/t5/core/autocomplete.ts
b/tapestry-core/src/main/typescript/src/t5/core/autocomplete.ts
index a9a11d8aa..69238e9fa 100644
--- a/tapestry-core/src/main/typescript/src/t5/core/autocomplete.ts
+++ b/tapestry-core/src/main/typescript/src/t5/core/autocomplete.ts
@@ -19,12 +19,16 @@
* the Twitter autocomplete.js library.
*/
import dom from "t5/core/dom";
-import underscore from "underscore";
+import _ from "underscore";
import $ from "jquery"
import utils from "t5/core/utils";
-import "t5/core/typeahead";
+import typeahead from "t5/core/typeahead";
-export const init = function(spec) {
+// Line below is used to force the TypeScript compiler to actually import
t5/core/typeahead
+// as it's not used directly here.
+let workaround = typeahead;
+
+export default function(spec) {
const $field = $(document.getElementById(spec.id));
const engine = new Bloodhound({
@@ -33,7 +37,7 @@ export const init = function(spec) {
limit: spec.limit,
remote: {
url: spec.url,
- replace(uri, query) { return extendURL(uri, {"t:input": query}); },
+ replace(uri, query) { return utils.extendURL(uri, {"t:input": query}); },
filter(response) { return response.matches; }
}
});
diff --git a/tapestry-core/src/main/typescript/src/t5/core/messages-amd.ts
b/tapestry-core/src/main/typescript/src/t5/core/messages-amd.ts
index 2e578d4dd..a15968256 100644
--- a/tapestry-core/src/main/typescript/src/t5/core/messages-amd.ts
+++ b/tapestry-core/src/main/typescript/src/t5/core/messages-amd.ts
@@ -39,7 +39,7 @@
locale = (document.documentElement.getAttribute("data-locale")) || "en";
// @ts-ignore
- define(["t5/core/messages/" + locale, "underscore", "t5/core/console"],
function(messages, _, console) {
+ define("t5/core/messages", ["t5/core/messages/" + locale, "underscore",
"t5/core/console"], function(messages, _, console) {
var get;
// @ts-ignore
get = function(key) {
diff --git a/tapestry-core/src/main/typescript/src/t5/core/utils.ts
b/tapestry-core/src/main/typescript/src/t5/core/utils.ts
index 2b536f553..7baeeed2f 100644
--- a/tapestry-core/src/main/typescript/src/t5/core/utils.ts
+++ b/tapestry-core/src/main/typescript/src/t5/core/utils.ts
@@ -66,5 +66,7 @@ export default {
},
// Splits the input string into words separated by whitespace
- split(str: string) { return _(str.split(" ")).reject(s => s === ""); }
+ split(str: string) {
+ return _(str.split(" ")).reject(s => s === "");
+ }
};
diff --git
a/tapestry-core/src/test/resources/META-INF/assets/ExpressionInJsFunction.js
b/tapestry-core/src/test/resources/META-INF/assets/ExpressionInJsFunction.js
index d4116c339..3cd15539d 100644
--- a/tapestry-core/src/test/resources/META-INF/assets/ExpressionInJsFunction.js
+++ b/tapestry-core/src/test/resources/META-INF/assets/ExpressionInJsFunction.js
@@ -1,4 +1,6 @@
require(["t5/core/dom"], function (dom) {
+
+ dom = dom.default;
window.test_func = function () {
dom('target').value("test1");
diff --git
a/tapestry-core/src/test/resources/META-INF/assets/PublishEventDemo.js
b/tapestry-core/src/test/resources/META-INF/assets/PublishEventDemo.js
index ca143dd65..e341cddcc 100644
--- a/tapestry-core/src/test/resources/META-INF/assets/PublishEventDemo.js
+++ b/tapestry-core/src/test/resources/META-INF/assets/PublishEventDemo.js
@@ -1,4 +1,7 @@
require(["t5/core/dom", "t5/core/ajax", "jquery"], function (dom, ajax, $) {
+
+ dom = dom.default;
+ ajax = ajax.default;
function makeAjaxCall(eventName, eventElement, outputElement) {
ajax(eventName, {
diff --git a/tapestry-core/src/test/resources/META-INF/modules/palette-demo.js
b/tapestry-core/src/test/resources/META-INF/modules/palette-demo.js
index 662032f9e..5e0f73f6e 100644
--- a/tapestry-core/src/test/resources/META-INF/modules/palette-demo.js
+++ b/tapestry-core/src/test/resources/META-INF/modules/palette-demo.js
@@ -4,12 +4,19 @@
* Full docs:
https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
define(["t5/core/dom", "t5/core/events", "underscore", "t5/core/console"],
- (dom, events, _, console) => dom = dom.default;
dom.default.on(events.palette.willChange, function(event, memo) {
+ (dom, events, _, console) => {
+ dom = dom.default;
+ events = events.default;
+ console = console.default;
+
+ dom.onDocument(events.palette.willChange, function(event, memo) {
- console.info("palette-demo, palette willChange");
+ console.info("palette-demo, palette willChange");
- const values = _.map(memo.selectedOptions, o => o.value);
+ const values = _.map(memo.selectedOptions, o => o.value);
- (dom("event-selection")).update(JSON.stringify(values));
- return (dom("event-reorder")).update(memo.reorder.toString());
- }));
\ No newline at end of file
+ (dom("event-selection")).update(JSON.stringify(values));
+ return (dom("event-reorder")).update(memo.reorder.toString());
+ });
+ }
+);
\ No newline at end of file
