aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-27 13:34:17 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-27 13:34:17 +0200
commit2bfbc07b7db8fbd5506b61a4e988363bfe955467 (patch)
tree5ce36773def5a02163303aaf6682fd04d4931ca7 /phpBB/assets
parent5442a2596718ea2ce81dfa31c44549f62311cd47 (diff)
parentb39b3da5af89d9687ff5e985244695131d36c753 (diff)
downloadforums-2bfbc07b7db8fbd5506b61a4e988363bfe955467.tar
forums-2bfbc07b7db8fbd5506b61a4e988363bfe955467.tar.gz
forums-2bfbc07b7db8fbd5506b61a4e988363bfe955467.tar.bz2
forums-2bfbc07b7db8fbd5506b61a4e988363bfe955467.tar.xz
forums-2bfbc07b7db8fbd5506b61a4e988363bfe955467.zip
Merge pull request #4021 from marc1706/ticket/14272
[ticket/14272] Use html5 valid input elements * marc1706/ticket/14272: [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')
-rw-r--r--phpBB/assets/javascript/core.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 4efebcacd1..f7ace80705 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1538,6 +1538,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);
+ }
});
};