Skip to content

Commit

Permalink
use canvas format to determine extension
Browse files Browse the repository at this point in the history
  • Loading branch information
edsilv committed Sep 2, 2015
1 parent 5383f70 commit 5611235
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Universal Viewer",
"version": "1.5.0",
"version": "1.5.1",
"repository": {
"type": "git",
"url": "git://github.com/UniversalViewer/universalviewer"
Expand Down
2 changes: 1 addition & 1 deletion examples
Submodule examples updated 506 files
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "UniversalViewer",
"version": "1.5.0",
"version": "1.5.1",
"description": "Navigate sequences of images in a zoomable, extensible interface.",
"devDependencies": {
"async": "^0.9.0",
Expand Down
6 changes: 3 additions & 3 deletions src/Bootstrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@ class Bootstrapper{
// try using canvasType
extension = this.extensions[canvasType.toString()];

// if there isn't an extension for the canvasType, try the rendering
// if there isn't an extension for the canvasType, try the format
if (!extension){
var renderings: Manifesto.IRendering[] = this.manifest.getRenderings(sequence);
extension = this.extensions[renderings[0].toString()];
var format = canvas.getProperty('format');
extension = this.extensions[format];
}

this.featureDetect(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/_Version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export var Version = '1.5.0';
export var Version = '1.5.1';

0 comments on commit 5611235

Please sign in to comment.