From f4101cea88a8a77c9c71c6509a6436eaa3b2a0d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Malbr=C3=A1n?= Date: Thu, 5 Sep 2013 21:55:49 -0300 Subject: [PATCH 1/4] Fixes the modal backdrop --- src/styles/brackets_patterns_override.less | 2 +- src/utils/UpdateNotification.js | 11 ++++++++--- src/widgets/Dialogs.js | 9 +++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index f3ba333f5af..70eff7f9410 100644 --- 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 index 662134129a4..62b1440b670 100644 --- a/src/utils/UpdateNotification.js +++ b/src/utils/UpdateNotification.js @@ -33,11 +33,12 @@ 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"), + AppInit = require("utils/AppInit"), 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"); @@ -208,6 +209,10 @@ define(function (require, exports, module) { updates.Strings = Strings; $updateList.html(Mustache.render(UpdateListTemplate, updates)); + + AppInit.appReady(function () { + $dlg.find("button").focus(); + }); } /** diff --git a/src/widgets/Dialogs.js b/src/widgets/Dialogs.js index 2cd9124ec4d..fbc788f7253 100644 --- 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; From ae9136d9fbcd4674defc61c9e3e4d294afd4a081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Malbr=C3=A1n?= Date: Tue, 10 Sep 2013 20:42:11 -0300 Subject: [PATCH 2/4] Moved the check for updates on start up to be done after the app is ready --- src/brackets.js | 1 - src/utils/UpdateNotification.js | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/brackets.js b/src/brackets.js index d3179941ac7..c4f9585b3a4 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -254,7 +254,6 @@ 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(); } } diff --git a/src/utils/UpdateNotification.js b/src/utils/UpdateNotification.js index 62b1440b670..f9adced44cf 100644 --- a/src/utils/UpdateNotification.js +++ b/src/utils/UpdateNotification.js @@ -209,10 +209,6 @@ define(function (require, exports, module) { updates.Strings = Strings; $updateList.html(Mustache.render(UpdateListTemplate, updates)); - - AppInit.appReady(function () { - $dlg.find("button").focus(); - }); } /** @@ -335,6 +331,11 @@ define(function (require, exports, module) { // Append locale to version info URL _versionInfoURL = brackets.config.update_info_url + brackets.getLocale() + ".json"; + // Check for updates on App Ready + AppInit.appReady(function () { + checkForUpdate(); + }); + // Define public API exports.checkForUpdate = checkForUpdate; }); From ce3a61d5128cb4367f2aa39ea23c583e5c6abd3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Malbr=C3=A1n?= Date: Tue, 17 Sep 2013 23:22:18 -0300 Subject: [PATCH 3/4] Moved the app ready block to the previous location --- src/brackets.js | 5 +++++ src/utils/UpdateNotification.js | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/brackets.js b/src/brackets.js index c4f9585b3a4..ff442216bb9 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -254,6 +254,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); + + // Check for updates on App Ready + AppInit.appReady(function () { + UpdateNotification.checkForUpdate(); + }); } } diff --git a/src/utils/UpdateNotification.js b/src/utils/UpdateNotification.js index f9adced44cf..5a752c7ba8e 100644 --- a/src/utils/UpdateNotification.js +++ b/src/utils/UpdateNotification.js @@ -330,11 +330,6 @@ define(function (require, exports, module) { // Append locale to version info URL _versionInfoURL = brackets.config.update_info_url + brackets.getLocale() + ".json"; - - // Check for updates on App Ready - AppInit.appReady(function () { - checkForUpdate(); - }); // Define public API exports.checkForUpdate = checkForUpdate; From b26d1010c955fac7e9f95487f180e108eacb06bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Malbr=C3=A1n?= Date: Tue, 17 Sep 2013 23:25:19 -0300 Subject: [PATCH 4/4] Removed unused dependency --- src/utils/UpdateNotification.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils/UpdateNotification.js b/src/utils/UpdateNotification.js index 5a752c7ba8e..f6fbe80fbe0 100644 --- a/src/utils/UpdateNotification.js +++ b/src/utils/UpdateNotification.js @@ -34,7 +34,6 @@ define(function (require, exports, module) { var Dialogs = require("widgets/Dialogs"), DefaultDialogs = require("widgets/DefaultDialogs"), PreferencesManager = require("preferences/PreferencesManager"), - AppInit = require("utils/AppInit"), Global = require("utils/Global"), NativeApp = require("utils/NativeApp"), StringUtils = require("utils/StringUtils"),