diff options
| author | Yuriy Rusko <github@rusko.net> | 2014-05-27 21:55:40 +0200 |
|---|---|---|
| committer | Yuriy Rusko <github@rusko.net> | 2014-05-27 21:55:40 +0200 |
| commit | 1d61bcedfd1882f84d102c523a354a8c4ae69336 (patch) | |
| tree | cbc3aead2546002d82fa0503eaab7f1520c515b8 /phpBB/assets/javascript | |
| parent | 27f787e5e4e118b77a3e16879d6c684bdaafc303 (diff) | |
| parent | 0acaa7722956635b8f17e19cddc6f02a602b7352 (diff) | |
| download | forums-1d61bcedfd1882f84d102c523a354a8c4ae69336.tar forums-1d61bcedfd1882f84d102c523a354a8c4ae69336.tar.gz forums-1d61bcedfd1882f84d102c523a354a8c4ae69336.tar.bz2 forums-1d61bcedfd1882f84d102c523a354a8c4ae69336.tar.xz forums-1d61bcedfd1882f84d102c523a354a8c4ae69336.zip | |
Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594
Conflicts:
phpBB/docs/hook_system.html
Diffstat (limited to 'phpBB/assets/javascript')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 9eba80542c..296c5b0ef9 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -15,7 +15,7 @@ var dark = $('#darkenwrapper'); var loadingIndicator = $('#loading_indicator'); var phpbbAlertTimer = null; -var isTouch = (window && typeof window.ontouchstart !== 'undefined'); +phpbb.isTouch = (window && typeof window.ontouchstart !== 'undefined'); /** * Display a loading screen @@ -1011,7 +1011,7 @@ phpbb.resizeTextArea = function(items, options) { resetCallback: function(item) { } }; - if (isTouch) return; + if (phpbb.isTouch) return; if (arguments.length > 1) { configuration = $.extend(configuration, options); |