diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 13:42:48 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 13:42:48 -0800 |
| commit | 355ceac4a04f4b83b23de9851e178faade263e53 (patch) | |
| tree | 9642327ea22870b57b5da6e3e46b49ba8b3841a9 /phpBB/assets | |
| parent | 6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4 (diff) | |
| parent | 739f1a3bdd733a45d9192d1e0d8da4e44caa1a3d (diff) | |
| download | forums-355ceac4a04f4b83b23de9851e178faade263e53.tar forums-355ceac4a04f4b83b23de9851e178faade263e53.tar.gz forums-355ceac4a04f4b83b23de9851e178faade263e53.tar.bz2 forums-355ceac4a04f4b83b23de9851e178faade263e53.tar.xz forums-355ceac4a04f4b83b23de9851e178faade263e53.zip | |
Merge pull request #1834 from cyberalien/ticket/11984
Move responsive design adjustments
Diffstat (limited to 'phpBB/assets')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 69a09427fe..98f00e1d58 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -15,6 +15,7 @@ var dark = $('#darkenwrapper'); var loadingIndicator = $('#loading_indicator'); var phpbbAlertTimer = null; +var isTouch = (window && typeof window.ontouchstart !== 'undefined'); /** * Display a loading screen @@ -623,8 +624,9 @@ phpbb.resizeTextArea = function(items, options) { resetCallback: function(item) { } }; - if (arguments.length > 1) - { + if (isTouch) return; + + if (arguments.length > 1) { configuration = $.extend(configuration, options); } |