summaryrefslogtreecommitdiffstats
path: root/doc/global/template/scripts
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2015-04-07 11:20:37 +0200
committerTopi Reiniƶ <topi.reinio@digia.com>2015-04-14 08:32:46 +0000
commitd238f7e0190c49c0f07c24f2f4ef9a50577c389b (patch)
tree77d7f87156d9a81d8dc6fc14c07235409c0ab401 /doc/global/template/scripts
parentd1eae5c527b2db44ab99012c2f213fa315bfd6f6 (diff)
Doc: Update online documentation template
This change brings the online template up to date with recent changes: - Update links in header and footer. - To improve page load time and reduce load on qt.io, do not load images from the main site. - Fix auto-scroll/highlight jQuery to work on anchors containing full stop ('.') characters - Responsiveness: Fix menu issues with narrow views - Fix styling of subscript/superscript HTML tags - Make script URIs protocol-agnostic Change-Id: I219e8ce6ff2e70f9374ad5e037ceda8f710a6a10 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'doc/global/template/scripts')
-rw-r--r--doc/global/template/scripts/extras.js6
-rw-r--r--doc/global/template/scripts/main.js6
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/global/template/scripts/extras.js b/doc/global/template/scripts/extras.js
index 409215f2d8..8a623a037e 100644
--- a/doc/global/template/scripts/extras.js
+++ b/doc/global/template/scripts/extras.js
@@ -4,7 +4,7 @@ $(function () {
$('a[href*=#]:not([href=#])').on('click', function (e) {
if (e.which == 2)
return true;
- var target = $(this.hash);
+ var target = $(this.hash.replace(/(\.)/g, "\\$1"));
target = target.length ? target : $('[name=' + this.hash.slice(1) + ']');
if (target.length) {
setTimeout(function () {
@@ -15,10 +15,10 @@ $(function () {
$(window).load(function () {
var h = window.location.hash;
- var re = /[^a-z0-9_\#\-]/i
+ var re = /[^a-z0-9_\.\#\-]/i
if (h.length > 1 && !re.test(h)) {
setTimeout(function () {
- $(window).scrollTop($(h).offset().top - vOffset);
+ $(window).scrollTop($(h.replace(/(\.)/g, "\\$1")).offset().top - vOffset);
}, 0);
}
});
diff --git a/doc/global/template/scripts/main.js b/doc/global/template/scripts/main.js
index 79de4ea5b2..823cebecf8 100644
--- a/doc/global/template/scripts/main.js
+++ b/doc/global/template/scripts/main.js
@@ -36,7 +36,7 @@ function load_sdk(s, id, src) {
fjs.parentNode.insertBefore(js, fjs);
}
$(document).ready(function($) {
- if (document.documentElement.clientWidth < 1220) {
+ if (document.documentElement.clientWidth < 1280) {
oneQt.extraLinksToMain();
}
@@ -76,7 +76,7 @@ $(document).ready(function($) {
$(window).resize(function() {
oneQt.stickySidebar();
oneQt.footerPosition();
- if (document.documentElement.clientWidth < 1220) {
+ if (document.documentElement.clientWidth < 1280) {
oneQt.extraLinksToMain();
} else {
oneQt.mainLinkstoExtra();
@@ -216,7 +216,7 @@ var oneQt = {
var extramenuLinks = $('#menuextras').find('li');
var mainmenu = $('#mainmenu');
var count = 0;
- if ($(extramenuLinks).length > 3) {
+ if ($(extramenuLinks).length > 2) {
$(extramenuLinks).each(function() {
if (count < 3) {
var newLink = $(this);