From cadabb5bb58c06b12a18e362d81b0d9ea3a0cc07 Mon Sep 17 00:00:00 2001 From: joe Date: Mon, 10 Oct 2016 08:18:11 -0700 Subject: [PATCH] use viewer state options to get enable cross origin setting (refs #367) --- source/js/viewer-core.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/js/viewer-core.js b/source/js/viewer-core.js index 624968a4..3786af51 100644 --- a/source/js/viewer-core.js +++ b/source/js/viewer-core.js @@ -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) @@ -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 = {