Commit 1a92a0ff authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

скролл убирается в презентациях и документах когда нечего скроллить

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58680 954022d7-b5bf-4e40-9824-e11837661b57
parent 0bc6d455
......@@ -1454,9 +1454,9 @@ function ScrollObject( elemID, settings, dbg ) {
scrollerColorOver:"#cfcfcf",
scrollerColorLayerOver:"#cfcfcf",
scrollerColorActive:"#ADADAD",
scrollBackgroundColor:"#F1F1F1",
scrollBackgroundColorHover:"#F1F1F1",
scrollBackgroundColorActive:"#F1F1F1",
scrollBackgroundColor:"#f4f4f4",
scrollBackgroundColorHover:"#f4f4f4",
scrollBackgroundColorActive:"#f4f4f4",
strokeStyleNone:"#cfcfcf",
strokeStyleOver:"#cfcfcf",
strokeStyleActive:"#ADADAD",
......@@ -1519,8 +1519,8 @@ function ScrollObject( elemID, settings, dbg ) {
this.paneHeight = 0;
this.paneWidth = 0;
this.maxScrollY = 2000;
this.maxScrollX = 2000;
this.maxScrollY = 0;
this.maxScrollX = 0;
this.scrollCoeff = 0;
......@@ -1795,11 +1795,23 @@ ScrollObject.prototype = {
this.RecalcScroller();
if ( this.isVerticalScroll ) {
this.scrollToY( this.scrollVCurrentY );
if(this.maxScrollY == 0){
this.canvas.style.display = "none";
}
else{
this.canvas.style.display = "";
}
}
if ( this.isHorizontalScroll ) {
else if ( this.isHorizontalScroll ) {
this.scrollToX( this.scrollHCurrentX );
if(this.maxScrollX == 0){
this.canvas.style.display = "none";
}
else{
this.canvas.style.display = "";
}
}
this._drawArrow();
this._draw();
},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment