From 2d32bd6d25f69dcbbe1382e4590f6182b49e8af2 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Mon, 16 Sep 2013 13:35:10 -0700 Subject: [PATCH 1/5] Tweaked content of inline CSS editor related column. --- src/editor/MultiRangeInlineEditor.js | 6 +++--- src/styles/brackets.less | 8 ++++++-- src/styles/brackets_colors.less | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/editor/MultiRangeInlineEditor.js b/src/editor/MultiRangeInlineEditor.js index 00e10b375d8..149dd55a1df 100644 --- a/src/editor/MultiRangeInlineEditor.js +++ b/src/editor/MultiRangeInlineEditor.js @@ -74,9 +74,9 @@ define(function (require, exports, module) { SearchResultItem.prototype.$listItem = null; function _updateRangeLabel(listItem, range) { - var text = range.name + " " + range.textRange.document.file.name + " : " + (range.textRange.startLine + 1); - listItem.text(text); - listItem.attr("title", text); + var text = range.name + " — " + range.textRange.document.file.name + " : " + (range.textRange.startLine + 1) + ""; + listItem.html(text); + listItem.attr("title", range.name + " " + range.textRange.document.file.name + " : " + (range.textRange.startLine + 1)); } /** diff --git a/src/styles/brackets.less b/src/styles/brackets.less index b36498d9a62..8e8170e424c 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -732,16 +732,20 @@ a, img { } li { - color: @inline-color-2; + color: @tc-emphasized-text; margin: 0; overflow: hidden; padding: 2px 0px 2px 15px; text-overflow: ellipsis; white-space: nowrap; + + .related-file { + color: @tc-input-placeholder-text; + } } .selected { - color: @inline-color-3; + color: @tc-emphasized-text; transition: color 0.1s ease-out .15s; } } diff --git a/src/styles/brackets_colors.less b/src/styles/brackets_colors.less index dcdac2c9228..acf3856b4e2 100644 --- a/src/styles/brackets_colors.less +++ b/src/styles/brackets_colors.less @@ -94,6 +94,7 @@ @tc-selected-row: #d0d5d5; @tc-hover-highlight: rgba(255, 255, 255, 0.6); @tc-text: #454545; +@tc-emphasized-text: #333; @tc-text-shadow: 0 1px 0 #fff; @tc-call-to-action: #288edf; @tc-call-to-action-border: #0055ad; From ef7ce50b2bc9f7a9ab6762bc0c78e945a3f7eefc Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Mon, 16 Sep 2013 13:36:33 -0700 Subject: [PATCH 2/5] Tweaked content of inline CSS editor related column. --- src/styles/brackets.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 8e8170e424c..a0b1cd8e61d 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -745,7 +745,7 @@ a, img { } .selected { - color: @tc-emphasized-text; + color: @tc-light-weight-text; transition: color 0.1s ease-out .15s; } } From c0200f7bf78e4eb1ef988da5629d2a306de5b5e9 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Tue, 17 Sep 2013 09:58:01 -0700 Subject: [PATCH 3/5] Fixes based on @peterflynn's feedback. --- src/editor/MultiRangeInlineEditor.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/editor/MultiRangeInlineEditor.js b/src/editor/MultiRangeInlineEditor.js index 149dd55a1df..cfb63af6296 100644 --- a/src/editor/MultiRangeInlineEditor.js +++ b/src/editor/MultiRangeInlineEditor.js @@ -46,7 +46,8 @@ define(function (require, exports, module) { Commands = require("command/Commands"), Strings = require("strings"), CommandManager = require("command/CommandManager"), - PerfUtils = require("utils/PerfUtils"); + PerfUtils = require("utils/PerfUtils"), + StringUtils = require("utils/StringUtils"); /** * Remove trailing "px" from a style size value. @@ -74,9 +75,9 @@ define(function (require, exports, module) { SearchResultItem.prototype.$listItem = null; function _updateRangeLabel(listItem, range) { - var text = range.name + " — " + range.textRange.document.file.name + " : " + (range.textRange.startLine + 1) + ""; + var text = range.name + " — " + StringUtils.htmlEscape(range.textRange.document.file.name) + " : " + (range.textRange.startLine + 1) + ""; listItem.html(text); - listItem.attr("title", range.name + " " + range.textRange.document.file.name + " : " + (range.textRange.startLine + 1)); + listItem.attr("title", listItem.text()); } /** From 3611b40d74e653dcc8216db17663f3aa5d93645e Mon Sep 17 00:00:00 2001 From: larz0 Date: Mon, 23 Sep 2013 22:26:13 -0700 Subject: [PATCH 4/5] Escaped range.name based on NJ's feedback. --- src/editor/MultiRangeInlineEditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/MultiRangeInlineEditor.js b/src/editor/MultiRangeInlineEditor.js index cfb63af6296..f1396e77c31 100644 --- a/src/editor/MultiRangeInlineEditor.js +++ b/src/editor/MultiRangeInlineEditor.js @@ -75,7 +75,7 @@ define(function (require, exports, module) { SearchResultItem.prototype.$listItem = null; function _updateRangeLabel(listItem, range) { - var text = range.name + " — " + StringUtils.htmlEscape(range.textRange.document.file.name) + " : " + (range.textRange.startLine + 1) + ""; + var text = StringUtils.htmlEscape(range.name) + " — " + StringUtils.htmlEscape(range.textRange.document.file.name) + " : " + (range.textRange.startLine + 1) + ""; listItem.html(text); listItem.attr("title", listItem.text()); } From 5a582b9c5ac0f1c1db76513fe42aca6749142faf Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Tue, 24 Sep 2013 10:56:59 -0700 Subject: [PATCH 5/5] Fix unit test for new string format in MultiRangeInlineEditor --- test/spec/MultiRangeInlineEditor-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/spec/MultiRangeInlineEditor-test.js b/test/spec/MultiRangeInlineEditor-test.js index 6397f5fd1f5..8828e474b24 100644 --- a/test/spec/MultiRangeInlineEditor-test.js +++ b/test/spec/MultiRangeInlineEditor-test.js @@ -104,8 +104,8 @@ define(function (require, exports, module) { inlineEditor.load(hostEditor); var $ruleListItems = $(inlineEditor.htmlContent).find("li"); - expect($($ruleListItems.get(0)).text()).toBe("div " + inlineDocName + " : 1"); - expect($($ruleListItems.get(1)).text()).toBe(".foo " + inlineDocName + " : 2"); + expect($($ruleListItems.get(0)).text()).toBe("div — " + inlineDocName + " : 1"); + expect($($ruleListItems.get(1)).text()).toBe(".foo — " + inlineDocName + " : 2"); }); it("should change selection to the next rule", function () {