Skip to content

Commit 795a055

Browse files
author
MFC Action
committed
Docs @ 6b3e012
1 parent 570b0c0 commit 795a055

File tree

4 files changed

+24
-112
lines changed

4 files changed

+24
-112
lines changed

documentation/resize.js

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@ function initResizable(treeview) {
5353
const footerHeight = footer.outerHeight();
5454
let navtreeHeight,sideNavHeight;
5555
if (typeof page_layout==='undefined' || page_layout==0) { /* DISABLE_INDEX=NO */
56-
contentHeight = windowHeight - headerHeight - footerHeight;
56+
contentHeight = windowHeight - headerHeight - footerHeight - 1;
5757
navtreeHeight = contentHeight;
5858
sideNavHeight = contentHeight;
5959
} else if (page_layout==1) { /* DISABLE_INDEX=YES */
60-
contentHeight = windowHeight - footerHeight;
61-
navtreeHeight = windowHeight - headerHeight;
62-
sideNavHeight = windowHeight;
60+
contentHeight = windowHeight - footerHeight - 1;
61+
navtreeHeight = windowHeight - headerHeight - 1;
62+
sideNavHeight = windowHeight - 1;
6363
}
6464
navtree.css({height:navtreeHeight + "px"});
6565
sidenav.css({height:sideNavHeight + "px"});
6666
}
6767
else
6868
{
69-
contentHeight = windowHeight - headerHeight;
69+
contentHeight = windowHeight - headerHeight - 1;
7070
}
7171
content.css({height:contentHeight + "px"});
7272
if (location.hash.slice(1)) {
@@ -91,27 +91,7 @@ function initResizable(treeview) {
9191
content = $("#doc-content");
9292
footer = $("#nav-path");
9393
sidenav = $("#side-nav");
94-
if (!treeview) {
95-
// title = $("#titlearea");
96-
// titleH = $(title).height();
97-
// let animating = false;
98-
// content.on("scroll", function() {
99-
// slideOpts = { duration: 200,
100-
// step: function() {
101-
// contentHeight = $(window).height() - header.outerHeight();
102-
// content.css({ height : contentHeight + "px" });
103-
// },
104-
// done: function() { animating=false; }
105-
// };
106-
// if (content.scrollTop()>titleH && title.css('display')!='none' && !animating) {
107-
// title.slideUp(slideOpts);
108-
// animating=true;
109-
// } else if (content.scrollTop()<=titleH && title.css('display')=='none' && !animating) {
110-
// title.slideDown(slideOpts);
111-
// animating=true;
112-
// }
113-
// });
114-
} else {
94+
if (treeview) {
11595
navtree = $("#nav-tree");
11696
$(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
11797
$(sidenav).resizable({ minWidth: 0 });
@@ -139,8 +119,6 @@ function initResizable(treeview) {
139119
{
140120
$("#splitbar").bind("dragstart", _preventDefault).bind("selectstart", _preventDefault);
141121
$(".ui-resizable-handle").dblclick(collapseExpand);
142-
// workaround for firefox
143-
$("body").css({overflow: "hidden"});
144122
}
145123
$(window).on('load',function() { resizeHeight(treeview); });
146124
}

post_process/resize.js

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@ function initResizable(treeview) {
5353
const footerHeight = footer.outerHeight();
5454
let navtreeHeight,sideNavHeight;
5555
if (typeof page_layout==='undefined' || page_layout==0) { /* DISABLE_INDEX=NO */
56-
contentHeight = windowHeight - headerHeight - footerHeight;
56+
contentHeight = windowHeight - headerHeight - footerHeight - 1;
5757
navtreeHeight = contentHeight;
5858
sideNavHeight = contentHeight;
5959
} else if (page_layout==1) { /* DISABLE_INDEX=YES */
60-
contentHeight = windowHeight - footerHeight;
61-
navtreeHeight = windowHeight - headerHeight;
62-
sideNavHeight = windowHeight;
60+
contentHeight = windowHeight - footerHeight - 1;
61+
navtreeHeight = windowHeight - headerHeight - 1;
62+
sideNavHeight = windowHeight - 1;
6363
}
6464
navtree.css({height:navtreeHeight + "px"});
6565
sidenav.css({height:sideNavHeight + "px"});
6666
}
6767
else
6868
{
69-
contentHeight = windowHeight - headerHeight;
69+
contentHeight = windowHeight - headerHeight - 1;
7070
}
7171
content.css({height:contentHeight + "px"});
7272
if (location.hash.slice(1)) {
@@ -91,27 +91,7 @@ function initResizable(treeview) {
9191
content = $("#doc-content");
9292
footer = $("#nav-path");
9393
sidenav = $("#side-nav");
94-
if (!treeview) {
95-
// title = $("#titlearea");
96-
// titleH = $(title).height();
97-
// let animating = false;
98-
// content.on("scroll", function() {
99-
// slideOpts = { duration: 200,
100-
// step: function() {
101-
// contentHeight = $(window).height() - header.outerHeight();
102-
// content.css({ height : contentHeight + "px" });
103-
// },
104-
// done: function() { animating=false; }
105-
// };
106-
// if (content.scrollTop()>titleH && title.css('display')!='none' && !animating) {
107-
// title.slideUp(slideOpts);
108-
// animating=true;
109-
// } else if (content.scrollTop()<=titleH && title.css('display')=='none' && !animating) {
110-
// title.slideDown(slideOpts);
111-
// animating=true;
112-
// }
113-
// });
114-
} else {
94+
if (treeview) {
11595
navtree = $("#nav-tree");
11696
$(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
11797
$(sidenav).resizable({ minWidth: 0 });
@@ -139,8 +119,6 @@ function initResizable(treeview) {
139119
{
140120
$("#splitbar").bind("dragstart", _preventDefault).bind("selectstart", _preventDefault);
141121
$(".ui-resizable-handle").dblclick(collapseExpand);
142-
// workaround for firefox
143-
$("body").css({overflow: "hidden"});
144122
}
145123
$(window).on('load',function() { resizeHeight(treeview); });
146124
}

pre_process/resize.js

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@ function initResizable(treeview) {
5353
const footerHeight = footer.outerHeight();
5454
let navtreeHeight,sideNavHeight;
5555
if (typeof page_layout==='undefined' || page_layout==0) { /* DISABLE_INDEX=NO */
56-
contentHeight = windowHeight - headerHeight - footerHeight;
56+
contentHeight = windowHeight - headerHeight - footerHeight - 1;
5757
navtreeHeight = contentHeight;
5858
sideNavHeight = contentHeight;
5959
} else if (page_layout==1) { /* DISABLE_INDEX=YES */
60-
contentHeight = windowHeight - footerHeight;
61-
navtreeHeight = windowHeight - headerHeight;
62-
sideNavHeight = windowHeight;
60+
contentHeight = windowHeight - footerHeight - 1;
61+
navtreeHeight = windowHeight - headerHeight - 1;
62+
sideNavHeight = windowHeight - 1;
6363
}
6464
navtree.css({height:navtreeHeight + "px"});
6565
sidenav.css({height:sideNavHeight + "px"});
6666
}
6767
else
6868
{
69-
contentHeight = windowHeight - headerHeight;
69+
contentHeight = windowHeight - headerHeight - 1;
7070
}
7171
content.css({height:contentHeight + "px"});
7272
if (location.hash.slice(1)) {
@@ -91,27 +91,7 @@ function initResizable(treeview) {
9191
content = $("#doc-content");
9292
footer = $("#nav-path");
9393
sidenav = $("#side-nav");
94-
if (!treeview) {
95-
// title = $("#titlearea");
96-
// titleH = $(title).height();
97-
// let animating = false;
98-
// content.on("scroll", function() {
99-
// slideOpts = { duration: 200,
100-
// step: function() {
101-
// contentHeight = $(window).height() - header.outerHeight();
102-
// content.css({ height : contentHeight + "px" });
103-
// },
104-
// done: function() { animating=false; }
105-
// };
106-
// if (content.scrollTop()>titleH && title.css('display')!='none' && !animating) {
107-
// title.slideUp(slideOpts);
108-
// animating=true;
109-
// } else if (content.scrollTop()<=titleH && title.css('display')=='none' && !animating) {
110-
// title.slideDown(slideOpts);
111-
// animating=true;
112-
// }
113-
// });
114-
} else {
94+
if (treeview) {
11595
navtree = $("#nav-tree");
11696
$(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
11797
$(sidenav).resizable({ minWidth: 0 });
@@ -139,8 +119,6 @@ function initResizable(treeview) {
139119
{
140120
$("#splitbar").bind("dragstart", _preventDefault).bind("selectstart", _preventDefault);
141121
$(".ui-resizable-handle").dblclick(collapseExpand);
142-
// workaround for firefox
143-
$("body").css({overflow: "hidden"});
144122
}
145123
$(window).on('load',function() { resizeHeight(treeview); });
146124
}

simulation/resize.js

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@ function initResizable(treeview) {
5353
const footerHeight = footer.outerHeight();
5454
let navtreeHeight,sideNavHeight;
5555
if (typeof page_layout==='undefined' || page_layout==0) { /* DISABLE_INDEX=NO */
56-
contentHeight = windowHeight - headerHeight - footerHeight;
56+
contentHeight = windowHeight - headerHeight - footerHeight - 1;
5757
navtreeHeight = contentHeight;
5858
sideNavHeight = contentHeight;
5959
} else if (page_layout==1) { /* DISABLE_INDEX=YES */
60-
contentHeight = windowHeight - footerHeight;
61-
navtreeHeight = windowHeight - headerHeight;
62-
sideNavHeight = windowHeight;
60+
contentHeight = windowHeight - footerHeight - 1;
61+
navtreeHeight = windowHeight - headerHeight - 1;
62+
sideNavHeight = windowHeight - 1;
6363
}
6464
navtree.css({height:navtreeHeight + "px"});
6565
sidenav.css({height:sideNavHeight + "px"});
6666
}
6767
else
6868
{
69-
contentHeight = windowHeight - headerHeight;
69+
contentHeight = windowHeight - headerHeight - 1;
7070
}
7171
content.css({height:contentHeight + "px"});
7272
if (location.hash.slice(1)) {
@@ -91,27 +91,7 @@ function initResizable(treeview) {
9191
content = $("#doc-content");
9292
footer = $("#nav-path");
9393
sidenav = $("#side-nav");
94-
if (!treeview) {
95-
// title = $("#titlearea");
96-
// titleH = $(title).height();
97-
// let animating = false;
98-
// content.on("scroll", function() {
99-
// slideOpts = { duration: 200,
100-
// step: function() {
101-
// contentHeight = $(window).height() - header.outerHeight();
102-
// content.css({ height : contentHeight + "px" });
103-
// },
104-
// done: function() { animating=false; }
105-
// };
106-
// if (content.scrollTop()>titleH && title.css('display')!='none' && !animating) {
107-
// title.slideUp(slideOpts);
108-
// animating=true;
109-
// } else if (content.scrollTop()<=titleH && title.css('display')=='none' && !animating) {
110-
// title.slideDown(slideOpts);
111-
// animating=true;
112-
// }
113-
// });
114-
} else {
94+
if (treeview) {
11595
navtree = $("#nav-tree");
11696
$(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
11797
$(sidenav).resizable({ minWidth: 0 });
@@ -139,8 +119,6 @@ function initResizable(treeview) {
139119
{
140120
$("#splitbar").bind("dragstart", _preventDefault).bind("selectstart", _preventDefault);
141121
$(".ui-resizable-handle").dblclick(collapseExpand);
142-
// workaround for firefox
143-
$("body").css({overflow: "hidden"});
144122
}
145123
$(window).on('load',function() { resizeHeight(treeview); });
146124
}

0 commit comments

Comments
 (0)