diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-27 13:34:54 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-27 13:34:54 +0200 |
| commit | a9090ecb0ebd9bf8d19e93135fdb94f030fdef7d (patch) | |
| tree | 78c9204d62efc659b4e9d4b6cc076aebb90dd6e2 /phpBB/assets/javascript/core.js | |
| parent | 386d31ec635c8e45d769706d2bf9e72f4aab46f0 (diff) | |
| parent | 1600d82b772f419aca8b35d9d404440fecc7a483 (diff) | |
| download | forums-a9090ecb0ebd9bf8d19e93135fdb94f030fdef7d.tar forums-a9090ecb0ebd9bf8d19e93135fdb94f030fdef7d.tar.gz forums-a9090ecb0ebd9bf8d19e93135fdb94f030fdef7d.tar.bz2 forums-a9090ecb0ebd9bf8d19e93135fdb94f030fdef7d.tar.xz forums-a9090ecb0ebd9bf8d19e93135fdb94f030fdef7d.zip | |
Merge pull request #4251 from marc1706/ticket/14272-3.2.x
[ticket/14272] Use html5 valid input elements
* marc1706/ticket/14272-3.2.x:
[ticket/14272] Allow input of floats for filesize
[ticket/14272] Use input type number instead of text in avatars
[ticket/14272] Assign min and max values for avatar driver settings
[ticket/14272] Define min and max values for avatar width and height
[ticket/14272] Disable not toggled form elements
[ticket/14272] Make sure phpbb_avatar_manager was defined
[ticket/14272] Remove useless check
[ticket/14272] Fix invalid or missing min/max settings
[ticket/14272] Assign min/max for all allowed types
[ticket/14272] Only use maxlength and size for allowed input elements
Diffstat (limited to 'phpBB/assets/javascript/core.js')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 5844537fc8..b00da3caff 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1541,6 +1541,13 @@ phpbb.toggleSelectSettings = function(el) { var $this = $(this), $setting = $($this.data('toggle-setting')); $setting.toggle($this.is(':selected')); + + // Disable any input elements that are not visible right now + if ($this.is(':selected')) { + $($this.data('toggle-setting') + ' input').prop('disabled', false); + } else { + $($this.data('toggle-setting') + ' input').prop('disabled', true); + } }); }; |