Mercurial > hg > digilib

changeset 1570:bfd2d6f709d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed issue where 'update' was triggered twice
author hertzhaft
date Mon, 07 Nov 2016 00:56:12 +0100
parents c3a01541e53f
children c7b8c035ffac
files webapp/src/main/webapp/jquery/jquery.digilib.js webapp/src/main/webapp/jquery/jquery.digilib.regions.js
diffstat 2 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Mon Nov 07 00:19:16 2016 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Mon Nov 07 00:56:12 2016 +0100
@@ -1026,11 +1026,12 @@
                             loadImageInfo(data);
                         }
                     }
-                    // update if we have a preview
-                    if (data.hasPreviewBg) {
-                        $(data).trigger('update');
-                    }
-                    //FIXME: highlightButtons(data);
+                    // update if we have a preview 
+                    // --- too early here, 'update' is triggered by scalerImgLoadedHandler
+                    // if (data.hasPreviewBg) {
+                        // $(data).trigger('update');
+                    // }
+                    // FIXME: highlightButtons(data);
                     // send event
                     $(data).trigger('redisplay');
                 } catch (e) {
--- a/webapp/src/main/webapp/jquery/jquery.digilib.regions.js	Mon Nov 07 00:19:16 2016 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.regions.js	Mon Nov 07 00:56:12 2016 +0100
@@ -232,7 +232,7 @@
             var show = !data.settings.isRegionVisible;
             data.settings.isRegionVisible = show;
             fn.highlightButtons(data, 'regions', show);
-            renderRegions(data, 0);
+            renderRegions(data, 1);
             return show;
         },
 
@@ -762,7 +762,7 @@
         console.debug("regions: handleUpdate");
         var settings = data.settings;
         fn.highlightButtons(data, 'regions' , settings.isRegionVisible);
-        renderRegions(data);
+        renderRegions(data, 1);
     };
 
     // additional buttons