Skip to content

Commit

Permalink
use viewer state options to get enable cross origin setting (refs DDM…
Browse files Browse the repository at this point in the history
  • Loading branch information
jezerinac committed Oct 10, 2016
1 parent 4f8bc38 commit cadabb5
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions source/js/viewer-core.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ function ViewerCore(element, options, publicInstance)
isIIIF: false, // Specifies whether objectData is in Diva native or IIIF Manifest format
isScrollable: true, // Used in enable/disableScrollable public methods
isZooming: false, // Flag to keep track of whether zooming is still in progress, for handleZoom
enableCrossOrigin: options.enableCrossOrigin,
loaded: false, // A flag for when everything is loaded and ready to go.
manifest: null,
mobileWebkit: false, // Checks if the user is on a touch device (iPad/iPod/iPhone/Android)
Expand Down Expand Up @@ -406,7 +405,7 @@ function ViewerCore(element, options, publicInstance)
viewport: viewerState.viewport,
outerElement: viewerState.outerElement,
innerElement: viewerState.innerElement,
enableCrossOrigin: viewerState.enableCrossOrigin
enableCrossOrigin: viewerState.options.enableCrossOrigin
};

var hooks = {
Expand Down

0 comments on commit cadabb5

Please sign in to comment.