mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix scrutinizer issues

This commit is contained in:
Jan-Christoph Borchardt 2015-03-27 09:37:52 +01:00
parent d728b85fdd
commit 701cb27a9e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/js/js.js
View File

@ -1264,18 +1264,19 @@ function initCore() {
// adjust controls bar width // adjust controls bar width
var adjustControlsWidth = function() { var adjustControlsWidth = function() {
if($('#controls').length) { if($('#controls').length) {
var controlsWidth;
// if there is a scrollbar … // if there is a scrollbar …
if($('#app-content').get(0).scrollHeight > $('#app-content').height()) { if($('#app-content').get(0).scrollHeight > $('#app-content').height()) {
if($(window).width() > 768) { if($(window).width() > 768) {
var controlsWidth = $('#content').width() - $('#app-navigation').width() - getScrollBarWidth(); controlsWidth = $('#content').width() - $('#app-navigation').width() - getScrollBarWidth();
} else { } else {
var controlsWidth = $('#content').width() - getScrollBarWidth(); controlsWidth = $('#content').width() - getScrollBarWidth();
} }
} else { // if there is none } else { // if there is none
if($(window).width() > 768) { if($(window).width() > 768) {
var controlsWidth = $('#content').width() - $('#app-navigation').width(); controlsWidth = $('#content').width() - $('#app-navigation').width();
} else { } else {
var controlsWidth = $('#content').width(); controlsWidth = $('#content').width();
} }
} }
$('#controls').css('width', controlsWidth); $('#controls').css('width', controlsWidth);
@ -1731,9 +1732,11 @@ function getScrollBarWidth() {
var w1 = inner.offsetWidth; var w1 = inner.offsetWidth;
outer.style.overflow = 'scroll'; outer.style.overflow = 'scroll';
var w2 = inner.offsetWidth; var w2 = inner.offsetWidth;
if (w1 == w2) w2 = outer.clientWidth; if(w1 === w2) {
w2 = outer.clientWidth;
}
document.body.removeChild (outer); document.body.removeChild (outer);
return (w1 - w2); return (w1 - w2);
}; }