Merge pull request #609 from edsilv/ed

British Library Universal Viewer changes
This commit is contained in:
Ian Gilman 2015-02-24 09:43:03 -08:00
commit a3754bee6e
3 changed files with 2 additions and 2 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ build/
sftp-config.json sftp-config.json
coverage/ coverage/
temp/ temp/
.idea

View File

@ -282,7 +282,7 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /*
bottomright; bottomright;
viewerSize = $.getElementSize( this.viewer.element ); viewerSize = $.getElementSize( this.viewer.element );
if ( this._resizeWithViewer && !viewerSize.equals( this.oldViewerSize ) ) { if ( this._resizeWithViewer && viewerSize.x && viewerSize.y && !viewerSize.equals( this.oldViewerSize ) ) {
this.oldViewerSize = viewerSize; this.oldViewerSize = viewerSize;
if ( this.maintainSizeRatio || !this.elementArea) { if ( this.maintainSizeRatio || !this.elementArea) {

View File

@ -836,7 +836,6 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
return this; return this;
}, },
/** /**
* @function * @function
* @return {Boolean} * @return {Boolean}