From 5dd00910f8743b4ad1d0e40c9fc2ca0f910d5d75 Mon Sep 17 00:00:00 2001 From: thatcher Date: Wed, 7 Dec 2011 21:41:07 -0500 Subject: [PATCH] this is a weird one, enjoy... duplicate method and implementations --- build.properties | 5 ++++- openseadragon.js | 44 -------------------------------------------- src/viewer.js | 44 -------------------------------------------- 3 files changed, 4 insertions(+), 89 deletions(-) diff --git a/build.properties b/build.properties index 35332bca..0e5dba9d 100644 --- a/build.properties +++ b/build.properties @@ -1,8 +1,11 @@ #OpenSeadragon build.properties +#TODO: how do you auto-increment build_id's with for every commit? +# TRY: continuos integration +# TRY: svn-hooks PROJECT: openseadragon BUILD_MAJOR: 0 BUILD_MINOR: 8 -BUILD_ID: 0 +BUILD_ID: 07 BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} diff --git a/openseadragon.js b/openseadragon.js index c73296db..b75dea54 100644 --- a/openseadragon.js +++ b/openseadragon.js @@ -1728,50 +1728,6 @@ $.Viewer.prototype = { } 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 () { if (!this.source) { return; diff --git a/src/viewer.js b/src/viewer.js index 0d3a2f6a..350f3b51 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -288,50 +288,6 @@ $.Viewer.prototype = { } 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 () { if (!this.source) { return;