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 #846 from adobe/randy/cleanup-style-names
Browse files Browse the repository at this point in the history 
Issue #408 - cleanup style names
  • Loading branch information
@jasonsanjose
jasonsanjose committed May 9, 2012
2 parents d62d77b + 23228d4 commit 7240964
Show file tree
Hide file tree
Showing 21 changed files with 99 additions and 99 deletions.
10 changes: 5 additions & 5 deletions src/brackets.js
View file
Expand Up @@ -270,7 +270,7 @@ define(function (require, exports, module) {
sidebarSnappedClosed = true;

// this keeps the triangle from jumping around
$(".triangleVisible").css("display", "none");
$(".triangle-visible").css("display", "none");
}
$(".main-view").on("mousemove.sidebar", function (e) {
// if we've gone below 10 pixels on a mouse move, and the
Expand All @@ -287,7 +287,7 @@ define(function (require, exports, module) {
// and register that the sidebar is no longer snapped closed.
if (e.clientX > 10) {
sidebarSnappedClosed = false;
$(".triangleVisible").css("display", "block");
$(".triangle-visible").css("display", "block");
}

$("#sidebar-resizer").css("left", e.clientX);
Expand All @@ -297,8 +297,8 @@ define(function (require, exports, module) {
$("#project-files-container").trigger("scroll");
$("#open-files-container").trigger("scroll");

// the .sidebarSelection needs to be explicitly set
$(".sidebarSelection").width(e.clientX);
// the .sidebar-selection needs to be explicitly set
$(".sidebar-selection").width(e.clientX);
}
EditorManager.resizeEditor();
e.preventDefault();
Expand All @@ -317,7 +317,7 @@ define(function (require, exports, module) {
$("body").addClass("platform-" + brackets.platform);


EditorManager.setEditorHolder($('#editorHolder'));
EditorManager.setEditorHolder($('#editor-holder'));

// Let the user know Brackets doesn't run in a web browser yet
if (brackets.inBrowser) {
Expand Down
6 changes: 3 additions & 3 deletions src/editor/EditorManager.js
View file
Expand Up @@ -354,7 +354,7 @@ define(function (require, exports, module) {
function _showEditor(document) {
// Hide whatever was visible before
if (!_currentEditor) {
$("#notEditor").css("display", "none");
$("#not-editor").css("display", "none");
} else {
_currentEditor.setVisible(false);
_destroyEditorIfUnneeded(_currentEditorsDocument);
Expand All @@ -379,7 +379,7 @@ define(function (require, exports, module) {
_currentEditorsDocument = null;
_currentEditor = null;

$("#notEditor").css("display", "");
$("#not-editor").css("display", "");

$(exports).triggerHandler("focusedEditorChange", _currentEditor);
}
Expand All @@ -390,7 +390,7 @@ define(function (require, exports, module) {
var doc = DocumentManager.getCurrentDocument(),
container = _editorHolder.get(0);

// Remove scrollerShadow from the current editor
// Remove scroller-shadow from the current editor
if (_currentEditor) {
ViewUtils.removeScrollerShadow(container, _currentEditor);
}
Expand Down
4 changes: 2 additions & 2 deletions src/editor/InlineTextEditor.js
View file
Expand Up @@ -39,7 +39,7 @@ define(function (require, exports, module) {
* @private
*/
function _editorHolderWidth() {
return $("#editorHolder").width();
return $("#editor-holder").width();
}

/**
Expand Down Expand Up @@ -216,7 +216,7 @@ define(function (require, exports, module) {
$dirtyIndicatorDiv.data("fullPath", doc.file.fullPath);

var $nameWithTooltip = $("<span></span>").text(doc.file.name).attr("title", doc.file.fullPath);
var $lineNumber = $("<span class='lineNumber'>" + (startLine + 1) + "</span>");
var $lineNumber = $("<span class='line-number'>" + (startLine + 1) + "</span>");

$filenameDiv.append($dirtyIndicatorDiv)
.append($nameWithTooltip)
Expand Down
2 changes: 1 addition & 1 deletion src/editor/InlineWidget.js
View file
Expand Up @@ -38,7 +38,7 @@ define(function (require, exports, module) {
function InlineWidget() {
// create the outer wrapper div
this.htmlContent = window.document.createElement("div");
this.$htmlContent = $(this.htmlContent).addClass("InlineWidget");
this.$htmlContent = $(this.htmlContent).addClass("inline-widget");
this.$htmlContent.append('<div class="shadow top"/>')
.append('<div class="shadow bottom"/>');
}
Expand Down
4 changes: 2 additions & 2 deletions src/editor/MultiRangeInlineEditor.js
View file
Expand Up @@ -125,7 +125,7 @@ define(function (require, exports, module) {
this.$editorsDiv = $(document.createElement('div')).addClass("inlineEditorHolder");

// Outer container for border-left and scrolling
this.$relatedContainer = $(document.createElement("div")).addClass("relatedContainer");
this.$relatedContainer = $(document.createElement("div")).addClass("related-container");
this._relatedContainerInserted = false;
this._relatedContainerInsertedHandler = this._relatedContainerInsertedHandler.bind(this);

Expand Down Expand Up @@ -171,7 +171,7 @@ define(function (require, exports, module) {
// attach to main container
this.$htmlContent.append(this.$editorsDiv).append(this.$relatedContainer);

// initialize position based on the main #editorHolder
// initialize position based on the main #editor-holder
setTimeout(this._updateRelatedContainer, 0);

// Changes to the host editor should update the relatedContainer
Expand Down
10 changes: 5 additions & 5 deletions src/index.html
View file
Expand Up @@ -193,20 +193,20 @@
</div>
</div>

<div id="editorHolder">
<div id="notEditor">
<div id="notEditorContent">[&nbsp;&nbsp;]</div>
<div id="editor-holder">
<div id="not-editor">
<div id="not-editor-content">[&nbsp;&nbsp;]</div>
</div>
</div>

<div id="jslint-results" class="bottom-panel">
<div class="toolbar simpleToolbarLayout">
<div class="toolbar simple-toolbar-layout">
<div class="title">JSLint errors</div>
</div>
<div class="table-container"></div>
</div>
<div id="search-results" class="bottom-panel">
<div class="toolbar simpleToolbarLayout">
<div class="toolbar simple-toolbar-layout">
<div class="title">Search Results</div>
<div class="title" id="search-result-summary"></div>
<a href="#" class="close">&times;</a>
Expand Down
2 changes: 1 addition & 1 deletion src/project/ProjectManager.js
View file
Expand Up @@ -362,7 +362,7 @@ define(function (require, exports, module) {
}
});

// fire selection changed events for sidebarSelection
// fire selection changed events for sidebar-selection
$projectTreeList = $projectTreeContainer.find("ul");
ViewUtils.sidebarList($projectTreeContainer, "jstree-clicked", "jstree-leaf");
$projectTreeContainer.show();
Expand Down
4 changes: 2 additions & 2 deletions src/project/WorkingSetView.js
View file
Expand Up @@ -109,7 +109,7 @@ define(function (require, exports, module) {
if ($fileStatusIcon) {
// cast to Boolean needed because toggleClass() distinguishes true/false from truthy/falsy
$fileStatusIcon.toggleClass("dirty", Boolean(isDirty));
$fileStatusIcon.toggleClass("canClose", Boolean(canClose));
$fileStatusIcon.toggleClass("can-close", Boolean(canClose));
}
}

Expand Down Expand Up @@ -262,7 +262,7 @@ define(function (require, exports, module) {
function _handleDirtyFlagChanged(doc) {
var listItem = _findListItemFromFile(doc.file);
if (listItem) {
var canClose = $(listItem).find("canClose").length === 1;
var canClose = $(listItem).find("can-close").length === 1;
_updateFileStatusIcon(listItem, doc.isDirty, canClose);
}

Expand Down
2 changes: 1 addition & 1 deletion src/search/FindInFiles.js
View file
Expand Up @@ -68,7 +68,7 @@ define(function (require, exports, module) {
*/
FindInFilesDialog.prototype._createDialogDiv = function (template) {
// FUTURE: consider using jQuery for all the DOM manipulation here
var wrap = $("#editorHolder")[0];
var wrap = $("#editor-holder")[0];
this.dialog = wrap.insertBefore(window.document.createElement("div"), wrap.firstChild);
this.dialog.className = "CodeMirror-dialog";
this.dialog.innerHTML = '<div>' + template + '</div>';
Expand Down
4 changes: 2 additions & 2 deletions src/search/QuickOpen.js
View file
Expand Up @@ -146,7 +146,7 @@ define(function (require, exports, module) {
* Creates a dialog div floating on top of the current code mirror editor
*/
QuickNavigateDialog.prototype._createDialogDiv = function (template) {
var $wrap = $("#editorHolder")[0];
var $wrap = $("#editor-holder")[0];
this.dialog = $wrap.insertBefore(window.document.createElement("div"), $wrap.firstChild);
this.dialog.className = "CodeMirror-dialog";
this.dialog.innerHTML = '<div align="right">' + template + '</div>';
Expand Down Expand Up @@ -461,7 +461,7 @@ define(function (require, exports, module) {
}

return "<li data-fullpath='" + encodeURIComponent(item) + "'>" + displayName +
"<br><span class='quickOpenPath'>" + rPath + "</span></li>";
"<br><span class='quick-open-path'>" + rPath + "</span></li>";
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/styles/bootstrap/mixins.less
View file
Expand Up @@ -44,9 +44,9 @@
}

// Font Stacks
@fontStackSansSerif: "Helvetica Neue", Helvetica, Arial, sans-serif;
@fontStackSerif: "Georgia", Times New Roman, Times, serif;
@fontStackMonospace: "Monaco", Courier New, monospace;
@fontstack-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
@fontstack-serif: "Georgia", Times New Roman, Times, serif;
@fontstack-monospace: "Monaco", Courier New, monospace;

#font {
.shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) {
Expand All @@ -55,19 +55,19 @@
line-height: @lineHeight;
}
.sans-serif(@weight: normal, @size: 14px, @lineHeight: 20px) {
font-family: @fontStackSansSerif;
font-family: @fontstack-sans-serif;
font-size: @size;
font-weight: @weight;
line-height: @lineHeight;
}
.serif(@weight: normal, @size: 14px, @lineHeight: 20px) {
font-family: @fontStackSerif;
font-family: @fontstack-serif;
font-size: @size;
font-weight: @weight;
line-height: @lineHeight;
}
.monospace(@weight: normal, @size: 12px, @lineHeight: 20px) {
font-family: @fontStackMonospace;
font-family: @fontstack-monospace;
font-size: @size;
font-weight: @weight;
line-height: @lineHeight;
Expand Down

0 comments on commit 7240964

Please sign in to comment.