Skip to content

Commit 59a9d56

Browse files
LukeWCSLukeWCS
committed
1.0.2
1 parent 971657d commit 59a9d56

File tree

10 files changed

+50
-26
lines changed

10 files changed

+50
-26
lines changed

‎docs/version_check.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"stable": {
33
"3.3": {
4-
"current": "1.0.1",
4+
"current": "1.0.2",
55
"announcement": "https://github.com/LukeWCS/toggle-control/releases",
66
"eol": null,
77
"security": false

‎lukewcs/togglectrl/adm/style/acp_togglectrl_settings.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ fieldset dt label {
2222
cursor: inherit;
2323
}
2424

25+
fieldset p.submit-buttons {
26+
margin-top: 0;
27+
padding: 0 4px 4px 4px;
28+
}
29+
2530
/*
2631
* phpBB ACP Toggles - A CSS class that makes it easy to display checkboxes as toggles.
2732
* Source : https://danklammer.com/articles/simple-css-toggle-switch/

‎lukewcs/togglectrl/adm/style/acp_togglectrl_settings.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h1>{{ lang('TOGGLECTRL_CONFIG_TITLE') }}</h1>
1818

1919
{{ _self.notes(TOGGLECTRL_NOTES) }}
2020

21-
<form id="togglectrl_form" method="post" action="{{ U_ACTION }}">
21+
<form id="togglectrl_settings" method="post" action="{{ U_ACTION }}">
2222
<fieldset>
2323
<legend>{{ lang('TOGGLECTRL_SETTINGS_TITLE') }}</legend>
2424

‎lukewcs/togglectrl/adm/style/acp_togglectrl_settings.js‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
*
88
*/
99

10-
(function () { // IIFE start
10+
(function ($) { // IIFE start
1111

1212
'use strict';
1313

14-
var constants = Object.freeze({
14+
const constants = Object.freeze({
1515
OpacityEnabled : '1.0',
1616
OpacityDisabled : '0.35',
1717
});
@@ -21,7 +21,7 @@ function setState() {
2121
};
2222

2323
function dimOptionGroup(elememtName, dimCondition) {
24-
var c = constants;
24+
const c = constants;
2525

2626
$('[name="' + elememtName + '"]').parents('dl').css('opacity', dimCondition ? c.OpacityDisabled : c.OpacityEnabled);
2727
}
@@ -32,11 +32,18 @@ function formReset() {
3232
});
3333
};
3434

35+
function disableEnter(e) {
36+
if (e.key == 'Enter' && e.target.type != 'textarea') {
37+
return false;
38+
}
39+
};
40+
3541
$(window).ready(function () {
3642
setState();
3743

38-
$('[name="togglectrl_enabled"]') .on('change', setState);
39-
$('#togglectrl_form') .on('reset' , formReset);
44+
$('#togglectrl_settings') .on('keypress' , disableEnter);
45+
$('#togglectrl_settings') .on('reset' , formReset);
46+
$('[name="togglectrl_enabled"]') .on('change' , setState);
4047
});
4148

42-
})(); // IIFE end
49+
})(jQuery); // IIFE end

‎lukewcs/togglectrl/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"type": "phpbb-extension",
44
"description": "Makes it possible to decide centrally for all extensions which visual style should be used for yes/no switches, provided extensions support Toggle Control.",
55
"homepage": "https://github.com/LukeWCS/toggle-control",
6-
"version": "1.0.1",
7-
"time": "2023-12-14",
6+
"version": "1.0.2",
7+
"time": "2024-01-15",
88
"license": "GPL-2.0-only",
99
"authors": [
1010
{

‎lukewcs/togglectrl/controller/acp_togglectrl_controller.php‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public function module_settings(): void
6666

6767
$this->template->assign_vars([
6868
'TOGGLECTRL_NOTES' => $notes,
69-
7069
'TOGGLECTRL_ENABLED' => $this->config['togglectrl_enabled'],
7170
] + (!$this->config['togglectrl_enabled'] ? [
7271
'TOGGLECTRL_TYPE' => $this->config['togglectrl_type'],
@@ -89,7 +88,7 @@ public function set_page_url(string $u_action): void
8988
private function set_meta_template_vars(string $tpl_prefix): void
9089
{
9190
$this->template->assign_vars([
92-
$tpl_prefix . '_METADATA' => [
91+
$tpl_prefix . '_METADATA' => [
9392
'EXT_NAME' => $this->metadata['extra']['display-name'],
9493
'EXT_VER' => $this->language->lang($tpl_prefix . '_VERSION_STRING', $this->metadata['version']),
9594
'LANG_DESC' => $this->language->lang($tpl_prefix . '_LANG_DESC'),
@@ -100,18 +99,12 @@ private function set_meta_template_vars(string $tpl_prefix): void
10099
]);
101100
}
102101

103-
// Determine the version of the language pack with fallback to 0.0.0
104-
private function get_lang_ver(string $lang_ext_ver): string
105-
{
106-
preg_match('/^([0-9]+\.[0-9]+\.[0-9]+)/', $this->language->lang($lang_ext_ver), $matches);
107-
return ($matches[1] ?? '0.0.0');
108-
}
109-
110102
// Check the language pack version for the minimum version and generate notice if outdated
111103
private function lang_ver_check_msg(string $lang_version_var, string $lang_outdated_var): string
112104
{
113105
$lang_outdated_msg = '';
114-
$ext_lang_ver = $this->get_lang_ver($lang_version_var);
106+
preg_match('/^([0-9]+\.[0-9]+\.[0-9]+)/', $this->language->lang($lang_version_var), $matches);
107+
$ext_lang_ver = $matches[1] ?? '0.0.0';
115108
$ext_lang_min_ver = $this->metadata['extra']['lang-min-ver'];
116109

117110
if (phpbb_version_compare($ext_lang_ver, $ext_lang_min_ver, '<'))

‎lukewcs/togglectrl/event/listener.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ public function generate_template_vars()
3939
{
4040
if ($this->config['togglectrl_enabled'])
4141
{
42-
$this->template->assign_vars([
43-
'TOGGLECTRL_TYPE' => $this->config['togglectrl_type'],
44-
]);
42+
$this->template->assign_var('TOGGLECTRL_TYPE', $this->config['togglectrl_type']);
4543
}
4644
}
4745
}

‎lukewcs/togglectrl/migrations/v_1_0_0.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public static function depends_on()
2020
public function update_data()
2121
{
2222
return [
23-
['config.add', ['togglectrl_enabled', 1]],
24-
['config.add', ['togglectrl_type', 'toggle']],
23+
['config.add', ['togglectrl_enabled' , 1]],
24+
['config.add', ['togglectrl_type' , 'toggle']],
2525
['module.add', [
2626
'acp',
2727
'ACP_CAT_DOT_MODS',

‎toggle-control_build_changelog.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
### 1.0.2
2+
* Release (2024-01-15)
3+
* PHP:
4+
* Code Optimierung im Controller.
5+
* JS:
6+
* Im Settings Formular wird jetzt die Enter Taste deaktiviert.
7+
* Im IIFE Konstrukt wird jetzt explizit das jQuery Objekt übergeben.
8+
* CSS:
9+
* In der Gruppe mit dem Absenden-Button den zu grossen Abstand zwischen Buttons und oberem Rand der Gruppe verkleinert.
10+
111
### 1.0.1
212
* Release (2023-12-14)
313
* Fix: Im `switch()` Makro wurde bei der Einstellung `checkbox` keine CSS Klasse generiert, wodurch der Mauszeiger über einer Checkbox nicht zu einem Pointer-Cursor geändert wurde. Bei Checkboxen wird jetzt explizit die passende Klasse generiert, die auch im ACP CSS definiert ist.
@@ -6,7 +16,7 @@
616
* Release (2023-12-07)
717
* Versionsprüfung hinzugefügt.
818

9-
### 1.0.0-b4
19+
#### 1.0.0-b4
1020
* Template:
1121
* Bei allen Optionsgruppen die ID entfernt, die für die Abblenden-Funktion benötigt wurde.
1222
* JS:

‎toggle-control_changelog_de.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
### 1.0.2
2+
(2024-01-15)
3+
4+
* PHP:
5+
* Code Optimierung im Controller.
6+
* JS:
7+
* Im Settings Formular wird jetzt die Enter Taste deaktiviert.
8+
* Im IIFE Konstrukt wird jetzt explizit das jQuery Objekt übergeben.
9+
* CSS:
10+
* In der Gruppe mit dem Absenden-Button den zu grossen Abstand zwischen Buttons und oberem Rand der Gruppe verkleinert.
11+
112
### 1.0.1
213
(2023-12-14)
314

0 commit comments

Comments
 (0)