Commit de83f98b authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

поправлено падение при наведении на подложку скролла в презентациях когда скролл отсутствует.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58338 954022d7-b5bf-4e40-9824-e11837661b57
parent 6df5599c
...@@ -668,6 +668,10 @@ ScrollObject.prototype = { ...@@ -668,6 +668,10 @@ ScrollObject.prototype = {
if ( this.canvas.addEventListener ) if ( this.canvas.addEventListener )
this.canvas.addEventListener( 'DOMMouseScroll', this.evt_mousewheel, false ); this.canvas.addEventListener( 'DOMMouseScroll', this.evt_mousewheel, false );
this.context.fillStyle = this.settings.scrollBackgroundColor;
this.context.fillRect(0,0,this.canvasW,this.canvasH);
this._drawArrow(); this._drawArrow();
this._draw(); this._draw();
...@@ -1147,8 +1151,9 @@ ScrollObject.prototype = { ...@@ -1147,8 +1151,9 @@ ScrollObject.prototype = {
} }
if(img){
that.context.drawImage( img, x, y ); that.context.drawImage( img, x, y );
}
} }
function fadeOut() { function fadeOut() {
...@@ -1263,8 +1268,9 @@ ScrollObject.prototype = { ...@@ -1263,8 +1268,9 @@ ScrollObject.prototype = {
} }
if(img){
that.context.drawImage( img, x, y ); that.context.drawImage( img, x, y );
}
} }
function drawScroller() { function drawScroller() {
......
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