summaryrefslogtreecommitdiffstats
path: root/doc/src/template/scripts/narrow.js
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-06-22 22:36:13 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-06-22 22:36:13 (GMT)
commit27d59016d35ae84d89e8d09bdadb1c3a89ac3f22 (patch)
treef493da0591281db183c23c86ecc3dc078009cafa /doc/src/template/scripts/narrow.js
parentb92a7337d47e8b1be2d65d5a726f7a6f291a65bb (diff)
parent5d3b132dd94f6c985fa3f9584dedb46823acddfe (diff)
downloadQt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.zip
Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.gz
Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.bz2
Merge remote branch 'origin/4.7' into qml-4.7
Conflicts: examples/declarative/modelviews/webview/transparent.qml
Diffstat (limited to 'doc/src/template/scripts/narrow.js')
-rw-r--r--doc/src/template/scripts/narrow.js13
1 files changed, 12 insertions, 1 deletions
diff --git a/doc/src/template/scripts/narrow.js b/doc/src/template/scripts/narrow.js
index 12d0ce8..35c81bf 100644
--- a/doc/src/template/scripts/narrow.js
+++ b/doc/src/template/scripts/narrow.js
@@ -59,9 +59,20 @@ var narrowInit = function() {
}
$(document).ready(function(){
- if ($('body').hasClass('narrow')) {
+/* if ($('body').hasClass('narrow')) {
narrowInit();
}
+ */
+ if($(window).width()<600) {
+ $('body').addClass('narrow');
+
+ if ($("#narrowsearch").length == 0) {
+ narrowInit();
+ }
+ }
+ else {
+ $('body').removeClass('narrow');
+ }
});
$(window).bind('resize', function () {