Add support to cancel full screen and full page events.

Fix fullpage when element has margin or padding.
This commit is contained in:
Antoine Vandecreme 2013-11-08 15:03:54 -05:00
parent 6aca0c0886
commit 03f25cef5f

View File

@ -669,13 +669,25 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
return this; return this;
} }
this.raiseEvent( 'pre-full-page', { fullPage: fullPage } ); var fullPageEventArgs = {
fullPage: fullPage,
preventDefaultAction: false
};
this.raiseEvent( 'pre-full-page', fullPageEventArgs );
if ( fullPageEventArgs.preventDefaultAction ) {
return this;
}
if ( fullPage ) { if ( fullPage ) {
this.elementSize = $.getElementSize( this.element ); this.elementSize = $.getElementSize( this.element );
this.pageScroll = $.getPageScroll(); this.pageScroll = $.getPageScroll();
this.elementMargin = this.element.style.margin;
this.element.style.margin = "0";
this.elementPadding = this.element.style.padding;
this.element.style.padding = "0";
this.bodyMargin = bodyStyle.margin; this.bodyMargin = bodyStyle.margin;
this.docMargin = docStyle.margin; this.docMargin = docStyle.margin;
bodyStyle.margin = "0"; bodyStyle.margin = "0";
@ -740,6 +752,9 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
} else { } else {
this.element.style.margin = this.elementMargin;
this.element.style.padding = this.elementPadding;
bodyStyle.margin = this.bodyMargin; bodyStyle.margin = this.bodyMargin;
docStyle.margin = this.docMargin; docStyle.margin = this.docMargin;
@ -827,10 +842,28 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
return this; return this;
} }
this.raiseEvent( 'pre-full-screen', { fullScreen: fullScreen } ); var fullScreeEventArgs = {
fullScreen: fullScreen,
preventDefaultAction: false
};
this.raiseEvent( 'pre-full-screen', fullScreeEventArgs );
if ( fullScreeEventArgs.preventDefaultAction ) {
return this;
}
if ( fullScreen ) { if ( fullScreen ) {
this.setFullPage( true ); this.setFullPage( true );
// If the full page mode is not actually entered, we need to prevent
// the full screen mode.
if ( !this.isFullPage() ) {
return this;
}
this.fullPageStyleWidth = this.element.style.width;
this.fullPageStyleHeight = this.element.style.height;
this.element.style.width = '100%';
this.element.style.height = '100%';
var onFullScreenChange = function() { var onFullScreenChange = function() {
var isFullScreen = $.isFullScreen(); var isFullScreen = $.isFullScreen();
@ -839,6 +872,10 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
$.removeEvent( document, $.fullScreenErrorEventName, onFullScreenChange ); $.removeEvent( document, $.fullScreenErrorEventName, onFullScreenChange );
_this.setFullPage( false ); _this.setFullPage( false );
if ( _this.isFullPage() ) {
_this.element.style.width = _this.fullPageStyleWidth;
_this.element.style.height = _this.fullPageStyleHeight;
}
} }
_this.raiseEvent( 'full-screen', { fullScreen: isFullScreen } ); _this.raiseEvent( 'full-screen', { fullScreen: isFullScreen } );
}; };
@ -847,8 +884,6 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
$.requestFullScreen( document.body ); $.requestFullScreen( document.body );
this.element.style.width = '100%';
this.element.style.height = '100%';
} else { } else {
$.cancelFullScreen(); $.cancelFullScreen();
} }