removed clickthrough

IIIF-Commons · Jul 31, 2015 · 8ec5d48 · 8ec5d48
1 parent 916e0d6
commit 8ec5d48
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 34 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "manifesto",
-    "version": "0.1.7",
+    "version": "0.1.8",
     "homepage": "https://github.com/edsilv/manifesto",
     "authors": [
         "edsilv <[email protected]>"

diff --git a/dist/client/manifesto.js b/dist/client/manifesto.js
@@ -611,15 +611,9 @@ var Manifesto;
                             });
                         }
                         else {
-                            // if the resource has a click through service, use that.
-                            if (resource.clickThroughService) {
-                                resolve(clickThrough(resource));
-                            }
-                            else {
-                                _this.authorize(resource, clickThrough, login, getAccessToken, storeAccessToken, getStoredAccessToken).then(function () {
-                                    resolve(handleResourceResponse(resource));
-                                });
-                            }
+                            _this.authorize(resource, clickThrough, login, getAccessToken, storeAccessToken, getStoredAccessToken).then(function () {
+                                resolve(handleResourceResponse(resource));
+                            });
                         }
                     });
                 }

diff --git a/dist/server/manifesto.js b/dist/server/manifesto.js
@@ -610,15 +610,9 @@ var Manifesto;
                             });
                         }
                         else {
-                            // if the resource has a click through service, use that.
-                            if (resource.clickThroughService) {
-                                resolve(clickThrough(resource));
-                            }
-                            else {
-                                _this.authorize(resource, clickThrough, login, getAccessToken, storeAccessToken, getStoredAccessToken).then(function () {
-                                    resolve(handleResourceResponse(resource));
-                                });
-                            }
+                            _this.authorize(resource, clickThrough, login, getAccessToken, storeAccessToken, getStoredAccessToken).then(function () {
+                                resolve(handleResourceResponse(resource));
+                            });
                         }
                     });
                 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "manifesto",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "IIIF Presentation API utility library for client and server",
   "main": "dist/server/manifesto.js",
   "scripts": {

diff --git a/src/Manifest.ts b/src/Manifest.ts
@@ -385,20 +385,15 @@ module Manifesto {
 
                             });
                         } else {
-                            // if the resource has a click through service, use that.
-                            if (resource.clickThroughService){
-                                resolve(clickThrough(resource));
-                            } else {
-                                this.authorize(
-                                    resource,
-                                    clickThrough,
-                                    login,
-                                    getAccessToken,
-                                    storeAccessToken,
-                                    getStoredAccessToken).then(() => {
-                                        resolve(handleResourceResponse(resource));
-                                    });
-                            }
+                            this.authorize(
+                                resource,
+                                clickThrough,
+                                login,
+                                getAccessToken,
+                                storeAccessToken,
+                                getStoredAccessToken).then(() => {
+                                    resolve(handleResourceResponse(resource));
+                                });
                         }
                     });
                 }