[#318] added logic to hide update prompt when other overlays are trig…

…gered
phonegap · Mar 5, 2015 · 38e720f · 38e720f
1 parent abff4bf
commit 38e720f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/www/index.html b/www/index.html
@@ -51,6 +51,7 @@
     global.missing = new Array();
     global.manifest = null;
     global.newAppPath = null;
+    global.pgdVersion = "";
 
     global.jQuery(document).ready(function() {
 
@@ -225,7 +226,7 @@
         });
 
         global.jQuery("#updateLater").click(function() {
-            global.jQuery("#updateOverlay").hide();
+            hideUpdateOverlay();
         });
 
         global.jQuery("#updateNow").click(function() {
@@ -235,9 +236,9 @@
             } else {
                 updateApp();
             }            
-            global.jQuery("#updateOverlay").hide();
+            hideUpdateOverlay();
         });
-        
+
         initSettings();
 
         hideProjectPathError();
@@ -246,7 +247,7 @@
         disableMinusButton();
         getProjects();  
 
-        checkIfToolbarEnabled();
+        parsePackageJSON();
     });
 
     function imgSwapper(img, src) {

diff --git a/www/js/sidebar-handlers.js b/www/js/sidebar-handlers.js
@@ -205,5 +205,9 @@ function hideOverlays() {
 
     if (global.jQuery("#helpOverlay").is(":visible")) {
         hideHelpOverlay();
-    }  
+    }
+
+    if (global.jQuery("#updateOverlay").is(":visible")) {
+        hideUpdateOverlay();
+    }
 }
diff --git a/www/js/updater.js b/www/js/updater.js
@@ -12,6 +12,10 @@ function displayInstallUpdatePrompt() {
     global.jQuery("#updateOverlay").show();   
 }
 
+function hideUpdateOverlay() {
+    global.jQuery("#updateOverlay").hide();
+}
+
 function restartApp () {
     // run the new version & quit the old app
     var newAppPath = global.newAppPath;