From 7f61e505ef25adeab93d5131df94d25dd9c8c477 Mon Sep 17 00:00:00 2001
From: NexusNovaz <tylerstaples21@outlook.com>
Date: Mon, 3 Mar 2025 17:11:59 +0000
Subject: [PATCH 1/4] Issue #3448413: Moved modules from widgets folder to
modules folder
---
{widgets => modules/jst_clock}/jst_clock.info.yml | 0
{widgets => modules/jst_clock}/jst_clock.module | 0
{widgets => modules/jst_timer}/jst_timer.info.yml | 0
{widgets => modules/jst_timer}/jst_timer.module | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename {widgets => modules/jst_clock}/jst_clock.info.yml (100%)
rename {widgets => modules/jst_clock}/jst_clock.module (100%)
rename {widgets => modules/jst_timer}/jst_timer.info.yml (100%)
rename {widgets => modules/jst_timer}/jst_timer.module (100%)
diff --git a/widgets/jst_clock.info.yml b/modules/jst_clock/jst_clock.info.yml
similarity index 100%
rename from widgets/jst_clock.info.yml
rename to modules/jst_clock/jst_clock.info.yml
diff --git a/widgets/jst_clock.module b/modules/jst_clock/jst_clock.module
similarity index 100%
rename from widgets/jst_clock.module
rename to modules/jst_clock/jst_clock.module
diff --git a/widgets/jst_timer.info.yml b/modules/jst_timer/jst_timer.info.yml
similarity index 100%
rename from widgets/jst_timer.info.yml
rename to modules/jst_timer/jst_timer.info.yml
diff --git a/widgets/jst_timer.module b/modules/jst_timer/jst_timer.module
similarity index 100%
rename from widgets/jst_timer.module
rename to modules/jst_timer/jst_timer.module
--
GitLab
From 470d937a55ef0a7799489fb40a47eecaed887426 Mon Sep 17 00:00:00 2001
From: NexusNovaz <tylerstaples21@outlook.com>
Date: Mon, 3 Mar 2025 17:16:09 +0000
Subject: [PATCH 2/4] Issue #3448413: Moved clocks directory to jst_clock
folder and removed widgets folder
---
{widgets => modules/jst_clock}/clocks/24h.svg | 0
{widgets => modules/jst_clock}/clocks/hamilton37500.svg | 0
{widgets => modules/jst_clock}/clocks/sleek1.svg | 0
modules/jst_clock/jst_clock.module | 2 +-
4 files changed, 1 insertion(+), 1 deletion(-)
rename {widgets => modules/jst_clock}/clocks/24h.svg (100%)
rename {widgets => modules/jst_clock}/clocks/hamilton37500.svg (100%)
rename {widgets => modules/jst_clock}/clocks/sleek1.svg (100%)
diff --git a/widgets/clocks/24h.svg b/modules/jst_clock/clocks/24h.svg
similarity index 100%
rename from widgets/clocks/24h.svg
rename to modules/jst_clock/clocks/24h.svg
diff --git a/widgets/clocks/hamilton37500.svg b/modules/jst_clock/clocks/hamilton37500.svg
similarity index 100%
rename from widgets/clocks/hamilton37500.svg
rename to modules/jst_clock/clocks/hamilton37500.svg
diff --git a/widgets/clocks/sleek1.svg b/modules/jst_clock/clocks/sleek1.svg
similarity index 100%
rename from widgets/clocks/sleek1.svg
rename to modules/jst_clock/clocks/sleek1.svg
diff --git a/modules/jst_clock/jst_clock.module b/modules/jst_clock/jst_clock.module
index 50e2722..5adced0 100644
--- a/modules/jst_clock/jst_clock.module
+++ b/modules/jst_clock/jst_clock.module
@@ -295,7 +295,7 @@ function jst_clock_form_jstimer_admin_settings_alter(&$form, FormStateInterface
'#type' => 'textfield',
'#title' => t('Clock svg file'),
'#default_value' => $config->get('jst_clock_sva_file'),
- '#description' => t('The name of the svg file to use for the SVG clock. They are stored in the widgets/clocks sub directory.'),
+ '#description' => t('The name of the svg file to use for the SVG clock. They are stored in the clocks sub directory.'),
);
$form['buttons']['#weight'] = 10;
--
GitLab
From 1d3512dd836f18c2fbe127734b6823ca64e59bd0 Mon Sep 17 00:00:00 2001
From: NexusNovaz <tylerstaples21@outlook.com>
Date: Mon, 3 Mar 2025 17:52:30 +0000
Subject: [PATCH 3/4] Issue #3448413: Mark .info.yml files as ^10
---
jstimer.info.yml | 2 +-
modules/jst_clock/jst_clock.info.yml | 2 +-
modules/jst_timer/jst_timer.info.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/jstimer.info.yml b/jstimer.info.yml
index cba02e0..c403ef7 100644
--- a/jstimer.info.yml
+++ b/jstimer.info.yml
@@ -1,7 +1,7 @@
name: 'Javascript Timer API'
description: 'Provides a timer api and several timer widgets for dynamic html things.'
package: 'Javascript timer api'
-core_version_requirement: ^9.5 || ^10 || ^11
+core_version_requirement: ^10 || ^11
type: module
dependencies:
- drupal:field
diff --git a/modules/jst_clock/jst_clock.info.yml b/modules/jst_clock/jst_clock.info.yml
index ef98ba8..da7d705 100644
--- a/modules/jst_clock/jst_clock.info.yml
+++ b/modules/jst_clock/jst_clock.info.yml
@@ -2,7 +2,7 @@ name: 'Javascript Timer API - Clock'
description: 'Uses the Javascript Timer API to provide a clock widget.'
package: 'Javascript timer api'
core: 8.x
-core_version_requirement: ">=8"
+core_version_requirement: "^10"
dependencies:
- jstimer
type: module
diff --git a/modules/jst_timer/jst_timer.info.yml b/modules/jst_timer/jst_timer.info.yml
index f07cfe4..65a9ef2 100644
--- a/modules/jst_timer/jst_timer.info.yml
+++ b/modules/jst_timer/jst_timer.info.yml
@@ -2,7 +2,7 @@ name: 'Javascript Timer API - Timer'
description: 'Uses the Javascript Timer API to provide a timer widget.'
package: 'Javascript timer api'
core: 8.x
-core_version_requirement: ">=8"
+core_version_requirement: "^10"
dependencies:
- jstimer
type: module
--
GitLab
From c24cd078fb7c2bcaf4e15198fb41a036b8ede71b Mon Sep 17 00:00:00 2001
From: Aaron Ferris <aaron@zoocha.com>
Date: Tue, 4 Mar 2025 10:43:43 +0000
Subject: [PATCH 4/4] Issue #3448413: tidy up info files
---
modules/jst_clock/jst_clock.info.yml | 3 +--
modules/jst_timer/jst_timer.info.yml | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/modules/jst_clock/jst_clock.info.yml b/modules/jst_clock/jst_clock.info.yml
index da7d705..4eee517 100644
--- a/modules/jst_clock/jst_clock.info.yml
+++ b/modules/jst_clock/jst_clock.info.yml
@@ -1,8 +1,7 @@
name: 'Javascript Timer API - Clock'
description: 'Uses the Javascript Timer API to provide a clock widget.'
package: 'Javascript timer api'
-core: 8.x
-core_version_requirement: "^10"
+core_version_requirement: ^10 || ^11
dependencies:
- jstimer
type: module
diff --git a/modules/jst_timer/jst_timer.info.yml b/modules/jst_timer/jst_timer.info.yml
index 65a9ef2..18de6d0 100644
--- a/modules/jst_timer/jst_timer.info.yml
+++ b/modules/jst_timer/jst_timer.info.yml
@@ -1,8 +1,7 @@
name: 'Javascript Timer API - Timer'
description: 'Uses the Javascript Timer API to provide a timer widget.'
package: 'Javascript timer api'
-core: 8.x
-core_version_requirement: "^10"
+core_version_requirement: ^10 || ^11
dependencies:
- jstimer
type: module
--
GitLab