Fix for #189 related to bug in angular ui, angular-ui/bootstrap#335

libris · Jan 29, 2015 · 0a99693 · 0a99693
1 parent 655e57f
commit 0a99693
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/static/js/main.js b/static/js/main.js
@@ -61,10 +61,14 @@ kitin.filter('unsafe', ['$sce', function ($sce) {
  * Global Constants
  * (TODO: move to service and depend on in required places instead)
  */
-kitin.run(function($rootScope, $location) {
+kitin.run(function($rootScope, $location, $modalStack) {
   $rootScope.API_PATH = WHELK_HOST;
   $rootScope.WRITE_API_PATH = WHELK_WRITE_HOST;
 
+  $rootScope.$on('$locationChangeStart', function (event) {
+    $modalStack.dismissAll();
+  });
+
   // Make sure we have no unsaved forms
   // var locationChangeOff = $rootScope.$on('$locationChangeStart', function (event, newUrl, oldUrl) {
   //   var forms = $rootScope.modifications;

diff --git a/templates/_media.html b/templates/_media.html
@@ -53,7 +53,7 @@
 <script src='/static/js/filters/SplitArray.js?v=20972db77411bf6574d9a7fd463be91b'></script>
 <script src='/static/js/filters/TimeAgo.js?v=1f9f9100bc012be7c8d0a2914876cb1d'></script>
 <script src='/static/js/gild.js?v=54055dd0fde58009d3cdc26c509f65e2'></script>
-<script src='/static/js/main.js?v=25bb18ec589c8ea567b5bebb377a8018'></script>
+<script src='/static/js/main.js?v=2c25404e9e808e1470ecbe5dfad84eb6'></script>
 <script src='/static/js/marcjson.js?v=3fea6bc9b29eca237c0af588524fb8f1'></script>
 <script src='/static/js/services/Definitions.js?v=86fc9a0c4f8a78d621bd23ae1325889d'></script>
 <script src='/static/js/services/EditService.js?v=24f671de02367a6f16825c5bdc7c99d7'></script>