mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 13:16:10 +03:00
Code Issues Projects Releases Wiki Activity

moved examples folder to gh-pages branch. fixed some refactor bugs that affected fullpage toggle. added copy to folder spcific in build.properties as WWW so the distributable openseadragon.js can be copied to gh-pages branch running locally. unearthed the ability to make controls fade (which apparently they were supposed to do by default)

Browse Source
This commit is contained in:
thatcher 2011-12-12 17:22:01 -05:00
parent 5dd00910f8
commit d4740545c5
5 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.properties
View File

@ -6,6 +6,10 @@
PROJECT: openseadragon PROJECT: openseadragon
BUILD_MAJOR: 0 BUILD_MAJOR: 0
BUILD_MINOR: 8 BUILD_MINOR: 8
BUILD_ID: 07 BUILD_ID: 08
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}
# This is the location of where we want to copy the built js file
# and other distributables like images.
WWW: ../www/openseadragon/

5
build.xml
View File

@ -9,6 +9,9 @@
Build file for Zoomable User Interface HTML5 project OpenSeadragon. Build file for Zoomable User Interface HTML5 project OpenSeadragon.
</description> </description>
<!-- YOU CAN OVERRIDE PROPERTIES PER YOUR NEED IN local.properties -->
<property file="local.properties" />
<!-- BASIC PROJECT PROPERTIES TO HELP TRACK VERSION --> <!-- BASIC PROJECT PROPERTIES TO HELP TRACK VERSION -->
<property file="build.properties" /> <property file="build.properties" />
@ -55,6 +58,8 @@
<filelist refid="openseadragon.javascript" /> <filelist refid="openseadragon.javascript" />
</concat> </concat>
<copy todir='${WWW}' file='openseadragon.js' />
</target> </target>
</project> </project>

12
openseadragon.js
View File

@ -3,7 +3,7 @@
* (c) 2010 OpenSeadragon * (c) 2010 OpenSeadragon
* (c) 2010 CodePlex Foundation * (c) 2010 CodePlex Foundation
* *
* OpenSeadragon 0.8.0 * OpenSeadragon 0.8.08
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* License: New BSD License (BSD) * License: New BSD License (BSD)
@ -197,6 +197,8 @@ OpenSeadragon = window.OpenSeadragon || (function(){
return target; return target;
}; };
$.Debug = window.console ? window.console : function(){};
}( OpenSeadragon )); }( OpenSeadragon ));
(function($){ (function($){
@ -2106,7 +2108,7 @@ $.Viewer.prototype = {
this._prevContainerSize = $.Utils.getWindowSize(); this._prevContainerSize = $.Utils.getWindowSize();
// mouse will be inside container now // mouse will be inside container now
onContainerEnter( this ); $.delegate( this, onContainerEnter )();
} else { } else {
@ -2126,7 +2128,7 @@ $.Viewer.prototype = {
this._prevContainerSize = $.Utils.getElementSize( this.element ); this._prevContainerSize = $.Utils.getElementSize( this.element );
// mouse will likely be outside now // mouse will likely be outside now
onContainerExit( this ); $.delegate( this, onContainerExit )();
} }
@ -2230,8 +2232,8 @@ function updateControlsFade( viewer ) {
opacity = Math.min( 1.0, opacity ); opacity = Math.min( 1.0, opacity );
opacity = Math.max( 0.0, opacity ); opacity = Math.max( 0.0, opacity );
for ( i = this.controls.length - 1; i >= 0; i--) { for ( i = viewer.controls.length - 1; i >= 0; i--) {
this.controls[ i ].setOpacity( opacity ); viewer.controls[ i ].setOpacity( opacity );
} }
if ( opacity > 0 ) { if ( opacity > 0 ) {

2
src/openseadragon.js
View File

@ -197,4 +197,6 @@ OpenSeadragon = window.OpenSeadragon || (function(){
return target; return target;
}; };
$.Debug = window.console ? window.console : function(){};
}( OpenSeadragon )); }( OpenSeadragon ));

8
src/viewer.js
View File

@ -666,7 +666,7 @@ $.Viewer.prototype = {
this._prevContainerSize = $.Utils.getWindowSize(); this._prevContainerSize = $.Utils.getWindowSize();
// mouse will be inside container now // mouse will be inside container now
onContainerEnter( this ); $.delegate( this, onContainerEnter )();
} else { } else {
@ -686,7 +686,7 @@ $.Viewer.prototype = {
this._prevContainerSize = $.Utils.getElementSize( this.element ); this._prevContainerSize = $.Utils.getElementSize( this.element );
// mouse will likely be outside now // mouse will likely be outside now
onContainerExit( this ); $.delegate( this, onContainerExit )();
} }
@ -790,8 +790,8 @@ function updateControlsFade( viewer ) {
opacity = Math.min( 1.0, opacity ); opacity = Math.min( 1.0, opacity );
opacity = Math.max( 0.0, opacity ); opacity = Math.max( 0.0, opacity );
for ( i = this.controls.length - 1; i >= 0; i--) { for ( i = viewer.controls.length - 1; i >= 0; i--) {
this.controls[ i ].setOpacity( opacity ); viewer.controls[ i ].setOpacity( opacity );
} }
if ( opacity > 0 ) { if ( opacity > 0 ) {