From 86ca15261461b6c74f66407e7ac6992baa097d0d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Wed, 26 Sep 2012 09:22:02 +0100
Subject: [PATCH] Revert "removed html dependency from media query detection JS
in new template"
... because it made the solution less transparent, more error prone and even more like a hack than it already was
This reverts commit 20391a36885910a616110df30f3ce30f8d23639d.
---
lib/tpl/dokuwiki/css/mobile.css | 15 ++++++++++-----
lib/tpl/dokuwiki/main.php | 1 +
lib/tpl/dokuwiki/script.js | 6 +++---
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index ea32fb11d..cc61ab06c 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -5,16 +5,18 @@
* @author Anika Henke <anika@selfthinker.org>
*/
-body {
- min-height: 0; /* for detecting media queries in JavaScript (see script.js): */
+/* for detecting media queries in JavaScript (see script.js): */
+#screen__mode {
+ position: relative;
+ z-index: 0;
}
/* up to 979px screen widths
********************************************************************/
@media only screen and (max-width: 979px) {
-body {
- min-height: 1px; /* for detecting media queries in JavaScript (see script.js) */
+#screen__mode {
+ z-index: 1; /* for detecting media queries in JavaScript (see script.js) */
}
/* structure */
@@ -115,9 +117,12 @@ body {
********************************************************************/
@media only screen and (max-width: 480px) {
+#screen__mode {
+ z-index: 2; /* for detecting media queries in JavaScript (see script.js) */
+}
+
body {
font-size: 100%;
- min-height: 2px; /* for detecting media queries in JavaScript (see script.js) */
}
/*____________ structure ____________*/
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 2406a206b..6b1e95d62 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -91,6 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
</div></div><!-- /site -->
<div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
+ <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?></div>
<!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
</body>
</html>
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js
index ec6e5285e..3ed8dbabe 100644
--- a/lib/tpl/dokuwiki/script.js
+++ b/lib/tpl/dokuwiki/script.js
@@ -13,16 +13,16 @@ var device_classes = 'desktop mobile tablet phone';
function tpl_dokuwiki_mobile(){
// the z-index in mobile.css is (mis-)used purely for detecting the screen mode here
- var screen_mode = jQuery('body').css('min-height');
+ var screen_mode = jQuery('#screen__mode').css('z-index');
// determine our device pattern
// TODO: consider moving into dokuwiki core
switch (screen_mode) {
- case '1px':
+ case '1':
if (device_class.match(/tablet/)) return;
device_class = 'mobile tablet';
break;
- case '2px':
+ case '2':
if (device_class.match(/phone/)) return;
device_class = 'mobile phone';
break;
--
GitLab