webstaff: use ng-show rather than ng-if for showIframe

This avoids an issue with ng-if creating a separate
scope.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>

diff --git a/Open-ILS/src/templates/staff/share/t_eframe.tt2 b/Open-ILS/src/templates/staff/share/t_eframe.tt2
index 0c9d72d..8bb274d 100644 (file)
--- a/Open-ILS/src/templates/staff/share/t_eframe.tt2
+++ b/Open-ILS/src/templates/staff/share/t_eframe.tt2
@@ -3,7 +3,7 @@
   <button type="button" class="btn btn-default btn-xs" ng-show="allowEscape && !showIframe" ng-click="restoreEmbed()">[% l('Re-embed') %]</button>
   <!-- height is calculated at render time -->
   <iframe 
-    ng-if="showIframe"
+    ng-show="showIframe"
     ng-attr-style="{{ autoresize ? undefined : 'height:' + height + 'px' }}"
     src="{{url}}">
   </iframe>

diff --git a/Open-ILS/web/js/ui/default/staff/services/eframe.js b/Open-ILS/web/js/ui/default/staff/services/eframe.js
index 9bd6e3d..e87b0ba 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/services/eframe.js
+++ b/Open-ILS/web/js/ui/default/staff/services/eframe.js
@@ -280,6 +280,7 @@ angular.module('egCoreMod')
             }
             $scope.restoreEmbed = function() {
                 $scope.showIframe = true;
+                $scope.reload();
             }
         }]
     }