Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1707 from ckarande/issue1561
Browse files Browse the repository at this point in the history
Fix for issue #1561
  • Loading branch information
Narciso Jaramillo committed Oct 3, 2012
2 parents b2f32e0 + 7306f52 commit 238f3ec
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions src/LiveDevelopment/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ define(function main(require, exports, module) {
function _handleGoLiveCommand() {
if (LiveDevelopment.status >= LiveDevelopment.STATUS_CONNECTING) {
LiveDevelopment.close();
// TODO Ty: when checkmark support lands, remove checkmark
} else {
if (!params.get("skipLiveDevelopmentInfo") && !prefs.getValue("afterFirstLaunch")) {
prefs.setValue("afterFirstLaunch", "true");
Expand All @@ -132,7 +131,6 @@ define(function main(require, exports, module) {
} else {
LiveDevelopment.open();
}
// TODO Ty: when checkmark support lands, add checkmark
}
}

Expand All @@ -155,6 +153,15 @@ define(function main(require, exports, module) {
// Initialize tooltip for 'not connected' state
_setLabel(_$btnGoLive, null, _statusStyle[1], _statusTooltip[1]);
}

/** Maintains state of the Live Preview menu item */
function _setupGoLiveMenu() {
$(LiveDevelopment).on("statusChange", function statusChange(event, status) {
// Update the checkmark next to 'Live Preview' menu item
// Add checkmark when status is STATUS_ACTIVE; otherwise remove it
CommandManager.get(Commands.FILE_LIVE_FILE_PREVIEW).setChecked(status === LiveDevelopment.STATUS_ACTIVE);
});
}

/** Create the menu item "Highlight" */
function _setupHighlightButton() {
Expand Down Expand Up @@ -191,6 +198,8 @@ define(function main(require, exports, module) {
LiveDevelopment.init(config);
_loadStyles();
_setupGoLiveButton();
_setupGoLiveMenu();

/* _setupHighlightButton(); FUTURE - Highlight button */
if (config.debug) {
_setupDebugHelpers();
Expand All @@ -211,7 +220,7 @@ define(function main(require, exports, module) {
}
}
window.setTimeout(init);

CommandManager.register(Strings.CMD_LIVE_FILE_PREVIEW, Commands.FILE_LIVE_FILE_PREVIEW, _handleGoLiveCommand);

// Export public functions
Expand Down

0 comments on commit 238f3ec

Please sign in to comment.