merged build.xml

This commit is contained in:
thatcher 2013-01-23 23:03:00 -05:00
commit 215395abb4
3 changed files with 20 additions and 24 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Version: $Id: build.xml 495 2011-07-07 20:14:37Z chth $ --> <!-- Version: $Id: build.xml 495 2011-07-07 20:14:37Z chth $ -->
<project name="openseadragon" <project name="openseadragon"
default="www"> default="build">
<tstamp/> <tstamp/>
@ -73,8 +73,6 @@
<publish page='ui-toolbar' title='Toolbar | '/> <publish page='ui-toolbar' title='Toolbar | '/>
<publish page='ui-viewport-navigator' title='Viewport Navigator | '/> <publish page='ui-viewport-navigator' title='Viewport Navigator | '/>
<publish page='workspace-dzi' title='Workspace - DZI | '/>
<publish page='developer-debug-mode' title='Developer Tools - Debug Mode | '/> <publish page='developer-debug-mode' title='Developer Tools - Debug Mode | '/>
<copy todir='${WWW}' file='openseadragon.js' /> <copy todir='${WWW}' file='openseadragon.js' />

View File

@ -5700,17 +5700,16 @@ $.extend( $.DziTileSource.prototype, $.TileSource.prototype, {
* @param {String} optional - url * @param {String} optional - url
*/ */
supports: function( data, url ){ supports: function( data, url ){
return ( var ns;
data.Image && if ( data.Image ) {
"http://schemas.microsoft.com/deepzoom/2008" == data.Image.xmlns ns = data.Image.xmlns;
) || ( } else if ( data.documentElement && "Image" == data.documentElement.tagName ) {
data.documentElement && ns = data.documentElement.namespaceURI;
"Image" == data.documentElement.tagName && }
"http://schemas.microsoft.com/deepzoom/2008" ==
data.documentElement.namespaceURI
);
},
return ( "http://schemas.microsoft.com/deepzoom/2008" == ns ||
"http://schemas.microsoft.com/deepzoom/2009" == ns );
},
/** /**
* *

View File

@ -69,17 +69,16 @@ $.extend( $.DziTileSource.prototype, $.TileSource.prototype, {
* @param {String} optional - url * @param {String} optional - url
*/ */
supports: function( data, url ){ supports: function( data, url ){
return ( var ns;
data.Image && if ( data.Image ) {
"http://schemas.microsoft.com/deepzoom/2008" == data.Image.xmlns ns = data.Image.xmlns;
) || ( } else if ( data.documentElement && "Image" == data.documentElement.tagName ) {
data.documentElement && ns = data.documentElement.namespaceURI;
"Image" == data.documentElement.tagName && }
"http://schemas.microsoft.com/deepzoom/2008" ==
data.documentElement.namespaceURI
);
},
return ( "http://schemas.microsoft.com/deepzoom/2008" == ns ||
"http://schemas.microsoft.com/deepzoom/2009" == ns );
},
/** /**
* *