From 07466251f2c0d60a5c6aaebb23c87d5cf26c7f02 Mon Sep 17 00:00:00 2001
From: Dan Scott <dscott@laurentian.ca>
Date: Mon, 17 Apr 2017 18:42:11 -0400
Subject: [PATCH] LP#1685840: Dojoless Google Books Preview does not need
 want_dojo

Now that Dojo is no longer needed for Google Books Preview, we can load
the associated JavaScript without having to enable want_dojo.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Ben Shum <ben@evergreener.net>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 Open-ILS/src/templates/opac/parts/header.tt2 | 4 ----
 Open-ILS/src/templates/opac/parts/js.tt2     | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/header.tt2 b/Open-ILS/src/templates/opac/parts/header.tt2
index 5b34c1672d..a0ffcb8fcf 100644
--- a/Open-ILS/src/templates/opac/parts/header.tt2
+++ b/Open-ILS/src/templates/opac/parts/header.tt2
@@ -116,10 +116,6 @@
         want_dojo = 1;
     END;
 
-    IF ctx.google_books_preview;
-        want_dojo = 1;
-    END;
-
     IF ENV.OILS_NOVELIST_URL;
         want_dojo = 1;
     END;
diff --git a/Open-ILS/src/templates/opac/parts/js.tt2 b/Open-ILS/src/templates/opac/parts/js.tt2
index 4d5b400f31..1deac91434 100644
--- a/Open-ILS/src/templates/opac/parts/js.tt2
+++ b/Open-ILS/src/templates/opac/parts/js.tt2
@@ -59,6 +59,7 @@
     IF CGI.https; url = url.replace('^http:', 'https:'); END; %]
 <script type='text/javascript' id='EIT' src='[% url %]'></script>
 [%- END %]
+[% INCLUDE "opac/parts/ac_google_books.tt2" IF ctx.page == 'record' AND ctx.google_books_preview %]
 [%- IF want_dojo; -%]
 <script type="text/javascript">
      var djConfig = {
@@ -101,7 +102,6 @@
 [% END; # use_autosuggest %]
 
 [% INCLUDE "opac/parts/acjs.tt2" IF ctx.page == 'record' %]
-[% INCLUDE "opac/parts/ac_google_books.tt2" IF ctx.page == 'record' AND ctx.google_books_preview %]
 [% IF ctx.page == 'advanced' %]
 <script type="text/javascript" 
     src="[% ctx.media_prefix %]/js/ui/default/opac/copyloc.js"></script>
-- 
2.43.2