Merge pull request #5085 from TomMalbran/tom/issue-5062

RaymondLim · RaymondLim · commit faa5dd7e9b62 · 2013-09-17T21:05:34.000-07:00
Fix #5062: Update notification is no longer modal
diff --git a/src/brackets.js b/src/brackets.js
@@ -257,7 +257,11 @@ define(function (require, exports, module) {
             // check once a day, plus 2 minutes, 
             // as the check will skip if the last check was not -24h ago
             window.setInterval(UpdateNotification.checkForUpdate, 86520000);
-            UpdateNotification.checkForUpdate();
+            
+            // Check for updates on App Ready
+            AppInit.appReady(function () {
+                UpdateNotification.checkForUpdate();
+            });
         }
     }
     
diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less
@@ -451,7 +451,7 @@
 .modal-backdrop {
     opacity: 0;
 }
-.modal-backdrop:last-child {
+.last-backdrop {
     /* Only show the last modal backdrop */
     opacity: 0.5;
 }
diff --git a/src/utils/UpdateNotification.js b/src/utils/UpdateNotification.js
@@ -33,11 +33,11 @@ define(function (require, exports, module) {
     
     var Dialogs              = require("widgets/Dialogs"),
         DefaultDialogs       = require("widgets/DefaultDialogs"),
-        NativeApp            = require("utils/NativeApp"),
         PreferencesManager   = require("preferences/PreferencesManager"),
-        Strings              = require("strings"),
-        StringUtils          = require("utils/StringUtils"),
         Global               = require("utils/Global"),
+        NativeApp            = require("utils/NativeApp"),
+        StringUtils          = require("utils/StringUtils"),
+        Strings              = require("strings"),
         UpdateDialogTemplate = require("text!htmlContent/update-dialog.html"),
         UpdateListTemplate   = require("text!htmlContent/update-list.html");
     
@@ -329,7 +329,7 @@ define(function (require, exports, module) {
     
     // Append locale to version info URL
     _versionInfoURL = brackets.config.update_info_url + brackets.getLocale() + ".json";
-    
+
     // Define public API
     exports.checkForUpdate = checkForUpdate;
 });
diff --git a/src/widgets/Dialogs.js b/src/widgets/Dialogs.js
@@ -252,6 +252,7 @@ define(function (require, exports, module) {
             
             // Remove the dialog instance from the DOM.
             $dlg.remove();
+            $(".modal-backdrop:last").addClass("last-backdrop");
 
             // Remove our global keydown handler.
             KeyBindingManager.removeGlobalKeydownHook(keydownHook);
@@ -273,7 +274,9 @@ define(function (require, exports, module) {
                 _dismissDialog($dlg, $(this).attr("data-button-id"));
             });
         }
-
+        
+        $(".last-backdrop").removeClass("last-backdrop");
+        
         // Run the dialog
         $dlg
             .modal({
@@ -283,7 +286,9 @@ define(function (require, exports, module) {
             })
             // Updates the z-index of the modal dialog and the backdrop
             .css("z-index", zIndex + 1)
-            .next().css("z-index", zIndex);
+            .next()
+            .css("z-index", zIndex)
+            .addClass("last-backdrop");
         
         zIndex += 2;
         

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,11 @@ define(function (require, exports, module) {`
`257`	`257`	`// check once a day, plus 2 minutes,`
`258`	`258`	`// as the check will skip if the last check was not -24h ago`
`259`	`259`	`window.setInterval(UpdateNotification.checkForUpdate, 86520000);`
`260`		`- UpdateNotification.checkForUpdate();`
	`260`	`+`
	`261`	`+ // Check for updates on App Ready`
	`262`	`+ AppInit.appReady(function () {`
	`263`	`+ UpdateNotification.checkForUpdate();`
	`264`	`+ });`
`261`	`265`	`}`
`262`	`266`	`}`
`263`	`267`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@`
`451`	`451`	`.modal-backdrop {`
`452`	`452`	`opacity: 0;`
`453`	`453`	`}`
`454`		`-.modal-backdrop:last-child {`
	`454`	`+.last-backdrop {`
`455`	`455`	`/* Only show the last modal backdrop */`
`456`	`456`	`opacity: 0.5;`
`457`	`457`	`}`