updates for modified manifesto api

UniversalViewer · Sep 7, 2015 · d6f74aa · d6f74aa
1 parent 5611235
commit d6f74aa
Show file tree

Hide file tree

Showing 13 changed files with 313 additions and 291 deletions.
diff --git a/src/extensions/uv-mediaelement-extension/DownloadDialogue.ts b/src/extensions/uv-mediaelement-extension/DownloadDialogue.ts
@@ -23,7 +23,7 @@ class DownloadDialogue extends BaseDownloadDialogue {
             // add each file src
             var canvas = this.provider.getCurrentCanvas();
 
-            _.each(this.provider.getRenderings(canvas), (rendering: any) => {
+            _.each(canvas.getRenderings(), (rendering: any) => {
                 this.addEntireFileDownloadOption(rendering);
             });
         }

diff --git a/src/extensions/uv-pdf-extension/DownloadDialogue.ts b/src/extensions/uv-pdf-extension/DownloadDialogue.ts
@@ -23,7 +23,7 @@ class DownloadDialogue extends BaseDownloadDialogue {
             // add each file src
             var canvas = this.provider.getCurrentCanvas();
 
-            _.each(this.provider.getRenderings(canvas), (rendering: any) => {
+            _.each(canvas.getRenderings(), (rendering: any) => {
                 this.addEntireFileDownloadOption(rendering);
             });
         }

diff --git a/src/extensions/uv-seadragon-extension/DownloadDialogue.ts b/src/extensions/uv-seadragon-extension/DownloadDialogue.ts
@@ -153,9 +153,9 @@ class DownloadDialogue extends BaseDownloadDialogue {
         this.$downloadOptions.find('.dynamic').remove();
     }
 
-    addDownloadOptionsForRenderings(resource: any, defaultLabel: string)
+    addDownloadOptionsForRenderings(resource: Manifesto.IManifestResource, defaultLabel: string)
     {
-        var renderings: Manifesto.IRendering[] = this.provider.getRenderings(resource);
+        var renderings: Manifesto.IRendering[] = manifesto.getRenderings(resource);
 
         for (var i = 0; i < renderings.length; i++) {
             var rendering: Manifesto.IRendering = renderings[i];

diff --git a/src/extensions/uv-seadragon-extension/Provider.ts b/src/extensions/uv-seadragon-extension/Provider.ts
@@ -183,7 +183,7 @@ class Provider extends BaseProvider implements ISeadragonProvider{
     }
 
     getAutoCompleteService(): Manifesto.IService {
-        return this.getService(this.manifest, manifesto.ServiceProfile.autoComplete());
+        return this.manifest.getService(manifesto.ServiceProfile.autoComplete());
     }
 
     getAutoCompleteUri(): string{
@@ -195,7 +195,7 @@ class Provider extends BaseProvider implements ISeadragonProvider{
     }
 
     getSearchWithinService(): Manifesto.IService {
-        return this.getService(this.manifest, manifesto.ServiceProfile.searchWithin());
+        return this.manifest.getService(manifesto.ServiceProfile.searchWithin());
     }
 
     getSearchWithinServiceUri(): string {

diff --git a/src/lib/embed.js b/src/lib/embed.js
@@ -424,7 +424,7 @@ docReady(function() {
                 if (config) uri += "&config=" + config;
                 if (jsonp) uri += "&jsonp=" + jsonp;
 
-                // these are values that getParam can either retrieve from hash or query string
+                // these are values that getParam can either retrieve from the iframe querystring or parent document hash params
                 if (sequenceIndex) uri += "&si=" + sequenceIndex;
                 if (canvasIndex) uri += "&ci=" + canvasIndex;
                 if (zoom) uri += "&z=" + zoom;