[open-ils-commits] [GIT] Evergreen ILS branch master updated. dc7f2b8746697ab24d12469b962bf3f87835202f

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  dc7f2b8746697ab24d12469b962bf3f87835202f (commit)
      from  e8ea527427c9279b66370693d497a6169bfdcf3d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc7f2b8746697ab24d12469b962bf3f87835202f
Author: Bill Erickson <berickxx at gmail.com>
Date:   Mon Mar 5 11:50:19 2018 -0500

    LP#1753008 Load iframeResizer via script tag
    
    iframeResizer does not currently play nicely with webpack.  Load it
    directly via script tag for now.
    
    This resolves a problem where the iframe fails to fill the screen when
    loading the reports UI in the browser client.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2
index 7b3d07f..e2e88de 100644
--- a/Open-ILS/src/templates/staff/base_js.tt2
+++ b/Open-ILS/src/templates/staff/base_js.tt2
@@ -75,6 +75,12 @@ UpUp.start({
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/moment-with-locales.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/moment-timezone-with-data.min.js"></script>
 
+<!--
+  Load iframeResize via script tag
+  https://bugs.launchpad.net/evergreen/+bug/1753008
+-->
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/iframeResizer.min.js"></script>
+
 <!-- evergreen core services -->
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/core.bundle.js"></script>
 
diff --git a/Open-ILS/web/js/ui/default/staff/webpack.config.js b/Open-ILS/web/js/ui/default/staff/webpack.config.js
index 3aa54ed..32e97b1 100644
--- a/Open-ILS/web/js/ui/default/staff/webpack.config.js
+++ b/Open-ILS/web/js/ui/default/staff/webpack.config.js
@@ -42,7 +42,9 @@ const IMAGE_FILES = [
 // https://github.com/webpack/webpack/issues/3128
 const JS_FILES = [
   './node_modules/moment/min/moment-with-locales.min.js',
-  './node_modules/moment-timezone/builds/moment-timezone-with-data.min.js'
+  './node_modules/moment-timezone/builds/moment-timezone-with-data.min.js',
+  './node_modules/iframe-resizer/js/iframeResizer.contentWindow.min.js',
+  './node_modules/iframe-resizer/js/iframeResizer.min.js'
 ]
 
 
@@ -99,7 +101,6 @@ const vendorJsFiles = [
   'ng-toast',
   'angular-tree-control',
   'angular-tree-control/context-menu.js',
-  'iframe-resizer',
   'angular-order-object-by',
   'lovefield',
   'angular-tablesort'

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/staff/base_js.tt2           |    6 ++++++
 Open-ILS/web/js/ui/default/staff/webpack.config.js |    5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS