Changeset 29625

Timestamp:

2014-12-13T00:28:58+13:00 (9 years ago)

Author:

davidb

Message:

Finessing of when to show progress bar

Location:

other-projects/nz-flag-design/trunk/similarity-2d

Files:

• display-flags.jsp (modified) (2 diffs)
• flag-processing.js (modified) (2 diffs)

other-projects/nz-flag-design/trunk/similarity-2d/display-flags.jsp

@@ -45 +45 @@
     </div>
 
-   <div id="progressArea">
+   <div id="progressArea" style="display: none;">
      <span id="loadingLabel">Loading: </span>
      <div id="progressBar"></div>
@@ -56 +56 @@
 
       if (!is_jsp_active) {
-        var mess = "<div>Web server is no JSP active.  Unable to run flag comparison</div>";
+        var mess = "<div>Web server is not JSP active.  Unable to run flag comparison</div>";
         $('#flagArea').append(mess);
       }

other-projects/nz-flag-design/trunk/similarity-2d/flag-processing.js

@@ -20 +20 @@
 function displayFlags(img_list,$displayDiv,$progressArea,$progressBar)
 {
-    var i;
-    
+    var img_list_len = img_list.length;
+    var show_progress = 5;
+
+    if (img_list_len==0) {
+    return;
+    }
+    else if (img_list_len>show_progress) {
+    $progressArea.slideDown();
+    }
+
     var root_img_re = /^.*\/(.*?)\..*?$/;
 
-    var img_list_len = img_list.length;
     var progress_step = 100.0 / img_list_len;
     
     var callback_count = 0;
     
+    var i;
     for (i=0; i<img_list.length; i++) {
     var img_url     = img_list[i];
@@ -43 +51 @@
         
         if (callback_count == img_list_len) {
-        $progressArea.slideUp();
+        if (img_list_len>show_progress) {
+            $progressArea.slideUp();
+        }
         }
     };