Scroll bar FF fixes Issue #51

This commit is contained in:
Peter Cottle 2013-02-21 09:12:32 -08:00
parent d1962d2a2e
commit f8a92580bd
7 changed files with 27 additions and 8 deletions

View file

@ -90,4 +90,5 @@ Or reported an issue that was successfully closed!
* Mael P ("maelp") * Mael P ("maelp")
* "flying-sheep" * "flying-sheep"
* "arianvp" * "arianvp"
* "MaPePeR"

View file

@ -18388,7 +18388,13 @@ var CommandLineHistoryView = Backbone.View.extend({
var cD = $('#commandDisplay')[0]; var cD = $('#commandDisplay')[0];
var t = $('#terminal')[0]; var t = $('#terminal')[0];
var shouldScroll = (cD.clientHeight > t.clientHeight); console.log('I AM CHECKING scroll ehight');
console.log(cD, t);
console.log(cD.clientHeight, t.clientHeight);
// firefox hack
var shouldScroll = (cD.clientHeight > t.clientHeight) ||
($(window).height() < cD.clientHeight);
$(t).toggleClass('scrolling', shouldScroll); $(t).toggleClass('scrolling', shouldScroll);
if (shouldScroll) { if (shouldScroll) {
t.scrollTop = t.scrollHeight; t.scrollTop = t.scrollHeight;
@ -24461,7 +24467,13 @@ var CommandLineHistoryView = Backbone.View.extend({
var cD = $('#commandDisplay')[0]; var cD = $('#commandDisplay')[0];
var t = $('#terminal')[0]; var t = $('#terminal')[0];
var shouldScroll = (cD.clientHeight > t.clientHeight); console.log('I AM CHECKING scroll ehight');
console.log(cD, t);
console.log(cD.clientHeight, t.clientHeight);
// firefox hack
var shouldScroll = (cD.clientHeight > t.clientHeight) ||
($(window).height() < cD.clientHeight);
$(t).toggleClass('scrolling', shouldScroll); $(t).toggleClass('scrolling', shouldScroll);
if (shouldScroll) { if (shouldScroll) {
t.scrollTop = t.scrollHeight; t.scrollTop = t.scrollHeight;

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored

File diff suppressed because one or more lines are too long

View file

@ -589,7 +589,7 @@ li.rebaseEntry a#toggleButton {
position: relative; position: relative;
font-size: 14px; font-size: 14px;
top: -5px; top: -5px;
right; -5px; right: -5px;
} }
li.rebaseEntry.notPicked { li.rebaseEntry.notPicked {

View file

@ -13,7 +13,7 @@
<meta property="og:image" content="http://pcottle.github.com/learnGitBranching/assets/learnGitBranching.png"/> <meta property="og:image" content="http://pcottle.github.com/learnGitBranching/assets/learnGitBranching.png"/>
<meta property="og:description" content="A interactive Git visualization tool to educate and challenge!"/> <meta property="og:description" content="A interactive Git visualization tool to educate and challenge!"/>
<link rel="stylesheet" href="build/main.657245d8.css" type="text/css" charset="utf-8"> <link rel="stylesheet" href="build/main.61a783f2.css" type="text/css" charset="utf-8">
<link rel="stylesheet" href="src/style/font-awesome.css" type="text/css" charset="utf-8"> <link rel="stylesheet" href="src/style/font-awesome.css" type="text/css" charset="utf-8">
</head> </head>
<body> <body>
@ -409,7 +409,7 @@
For a much easier time perusing the source, see the individual files at: For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching https://github.com/pcottle/learnGitBranching
--> -->
<script src="build/bundle.min.d4974b81.js"></script> <script src="build/bundle.min.3421e8e8.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic. <!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include The downside? No raw logs to parse for analytics, so I have to include

View file

@ -357,7 +357,13 @@ var CommandLineHistoryView = Backbone.View.extend({
var cD = $('#commandDisplay')[0]; var cD = $('#commandDisplay')[0];
var t = $('#terminal')[0]; var t = $('#terminal')[0];
var shouldScroll = (cD.clientHeight > t.clientHeight); console.log('I AM CHECKING scroll ehight');
console.log(cD, t);
console.log(cD.clientHeight, t.clientHeight);
// firefox hack
var shouldScroll = (cD.clientHeight > t.clientHeight) ||
($(window).height() < cD.clientHeight);
$(t).toggleClass('scrolling', shouldScroll); $(t).toggleClass('scrolling', shouldScroll);
if (shouldScroll) { if (shouldScroll) {
t.scrollTop = t.scrollHeight; t.scrollTop = t.scrollHeight;