this is a weird one, enjoy... duplicate method and implementations

This commit is contained in:
thatcher 2011-12-07 21:41:07 -05:00
parent 1726a878c1
commit 5dd00910f8
3 changed files with 4 additions and 89 deletions

View File

@ -1,8 +1,11 @@
#OpenSeadragon build.properties #OpenSeadragon build.properties
#TODO: how do you auto-increment build_id's with for every commit?
# TRY: continuos integration
# TRY: svn-hooks
PROJECT: openseadragon PROJECT: openseadragon
BUILD_MAJOR: 0 BUILD_MAJOR: 0
BUILD_MINOR: 8 BUILD_MINOR: 8
BUILD_ID: 0 BUILD_ID: 07
BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}

View File

@ -1728,50 +1728,6 @@ $.Viewer.prototype = {
} }
raiseEvent( this, "open" ); raiseEvent( this, "open" );
}, },
_updateOnce: function () {
if (!this.source) {
return;
}
this.profiler.beginUpdate();
var containerSize = $.Utils.getElementSize( this.container );
if ( !containerSize.equals( this._prevContainerSize ) ) {
this.viewport.resize( containerSize, true) ; // maintain image position
this._prevContainerSize = containerSize;
raiseEvent( this, "resize", this );
}
var animated = this.viewport.update();
if ( !this._animating && animated ) {
raiseEvent( this, "animationstart", this );
abortControlsAutoHide( this );
}
if ( animated ) {
this.drawer.update();
raiseEvent( this, "animation", this );
} else if ( this._forceRedraw || this.drawer.needsUpdate() ) {
this.drawer.update();
this._forceRedraw = false;
} else {
this.drawer.idle();
}
if ( this._animating && !animated ) {
raiseEvent( this, "animationfinish", this );
if ( !this._mouseInside ) {
beginControlsAutoHide( this );
}
}
this._animating = animated;
this.profiler.endUpdate();
},
_updateMulti: function () { _updateMulti: function () {
if (!this.source) { if (!this.source) {
return; return;

View File

@ -288,50 +288,6 @@ $.Viewer.prototype = {
} }
raiseEvent( this, "open" ); raiseEvent( this, "open" );
}, },
_updateOnce: function () {
if (!this.source) {
return;
}
this.profiler.beginUpdate();
var containerSize = $.Utils.getElementSize( this.container );
if ( !containerSize.equals( this._prevContainerSize ) ) {
this.viewport.resize( containerSize, true) ; // maintain image position
this._prevContainerSize = containerSize;
raiseEvent( this, "resize", this );
}
var animated = this.viewport.update();
if ( !this._animating && animated ) {
raiseEvent( this, "animationstart", this );
abortControlsAutoHide( this );
}
if ( animated ) {
this.drawer.update();
raiseEvent( this, "animation", this );
} else if ( this._forceRedraw || this.drawer.needsUpdate() ) {
this.drawer.update();
this._forceRedraw = false;
} else {
this.drawer.idle();
}
if ( this._animating && !animated ) {
raiseEvent( this, "animationfinish", this );
if ( !this._mouseInside ) {
beginControlsAutoHide( this );
}
}
this._animating = animated;
this.profiler.endUpdate();
},
_updateMulti: function () { _updateMulti: function () {
if (!this.source) { if (!this.source) {
return; return;