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

Fixed status bar so it can add indicators to itself again #6304

Merged
redmunds merged 5 commits into from
Dec 27, 2013
Merged

Fixed status bar so it can add indicators to itself again #6304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c47783e
addIndicator now adds to DOM, add special case for CodeInspection module
lkcampbell Dec 22, 2013
9ffd031
Small code cleanup
lkcampbell Dec 22, 2013
462bea2
Make sure _beforeID element exists before inserting indicator before it
lkcampbell Dec 23, 2013
77a0364
Add public parameter insertBefore to StatusBar.addIndicator()
lkcampbell Dec 24, 2013
7c4197f
Update 'busy' indicator comments
lkcampbell Dec 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/language/CodeInspection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,7 @@ define(function (require, exports, module) {

// Status bar indicator - icon & tooltip updated by run()
var statusIconHtml = Mustache.render("<div id=\"status-inspection\">&nbsp;</div>", Strings);
$(statusIconHtml).insertBefore("#status-language");
StatusBar.addIndicator(INDICATOR_ID, $("#status-inspection"));
StatusBar.addIndicator(INDICATOR_ID, $(statusIconHtml), true, "", "", "status-indent");

$("#status-inspection").click(function () {
// Clicking indicator toggles error panel, if any errors in current file
Expand Down
18 changes: 16 additions & 2 deletions src/widgets/StatusBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,16 @@ define(function (require, exports, module) {
* @param {boolean=} visible Shows or hides the indicator over the statusbar.
* @param {string=} style Sets the attribute "class" of the indicator.
* @param {string=} tooltip Sets the attribute "title" of the indicator.
* @param {string=} insertBefore An id of an existing status bar indicator.
* The new indicator will be inserted before (i.e. to the left of)
* the indicator specified by this parameter.
*/
function addIndicator(id, indicator, visible, style, tooltip) {
function addIndicator(id, indicator, visible, style, tooltip, insertBefore) {
if (!_init) {
console.error("StatusBar API invoked before status bar created");
return;
}

indicator = indicator || document.createElement("div");
tooltip = tooltip || "";
style = style || "";
Expand All @@ -121,6 +124,17 @@ define(function (require, exports, module) {
$indicator.hide();
}

// This code looks backwards because the DOM model is ordered
// top-to-bottom but the UI view is ordered right-to-left. The concept
// of "before" in the model is "after" in the view, and vice versa.
if (insertBefore && $("#" + insertBefore).length > 0) {
$indicator.insertAfter("#" + insertBefore);
} else {
// No positioning is provided, put on left end of indicators, but
// to right of "busy" indicator (which is usually hidden).
var $busyIndicator = $("#status-bar .spinner");
$indicator.insertBefore($busyIndicator);
}
}

/**
Expand Down