mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-16 23:03:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #999 from rburgstaler/rpb/make-tilsources-option-smarter-with-json-xml-string

Browse Source 
Make tileSources option smarter about detecting when a json string or…
This commit is contained in:
Ian Gilman 2016-08-11 09:46:07 -07:00 committed by GitHub
commit b481a17298
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/viewer.js
View File

@ -2121,9 +2121,11 @@ function getTileSourceImplementation( viewer, tileSource, imgOptions, successCal
//allow plain xml strings or json strings to be parsed here //allow plain xml strings or json strings to be parsed here
if ( $.type( tileSource ) == 'string' ) { if ( $.type( tileSource ) == 'string' ) {
if ( tileSource.match( /\s*<.*/ ) ) { //xml should start with "<" and end with ">"
if ( tileSource.match( /^\s*<.*>\s*$/ ) ) {
tileSource = $.parseXml( tileSource ); tileSource = $.parseXml( tileSource );
} else if ( tileSource.match( /\s*[\{\[].*/ ) ) { //json should start with "{" or "[" and end with "}" or "]"
} else if ( tileSource.match(/^\s*[\{\[].*[\}\]]\s*$/ ) ) {
tileSource = $.parseJSON(tileSource); tileSource = $.parseJSON(tileSource);
} }
} }