Merge pull request #5230 from adobe/larz/quick-edit-tweak

Narciso Jaramillo · Narciso Jaramillo · commit 844931f1b498 · 2013-09-24T11:00:16.000-07:00
Quick Edit tweak
diff --git 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);
-        listItem.text(text);
-        listItem.attr("title", text);
+        var text = StringUtils.htmlEscape(range.name) + " <span class='related-file'>— " + StringUtils.htmlEscape(range.textRange.document.file.name) + " : " + (range.textRange.startLine + 1) + "</span>";
+        listItem.html(text);
+        listItem.attr("title", listItem.text());
     }
     
     /**
diff --git 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-light-weight-text;
             transition: color 0.1s ease-out .15s;
         }
     }
diff --git 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;
diff --git 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 () {

Original file line number	Diff line number	Diff line change
`@@ -732,16 +732,20 @@ a, img {`
`732`	`732`	`}`
`733`	`733`
`734`	`734`	`li {`
`735`		`- color: @inline-color-2;`
	`735`	`+ color: @tc-emphasized-text;`
`736`	`736`	`margin: 0;`
`737`	`737`	`overflow: hidden;`
`738`	`738`	`padding: 2px 0px 2px 15px;`
`739`	`739`	`text-overflow: ellipsis;`
`740`	`740`	`white-space: nowrap;`
	`741`	`+`
	`742`	`+ .related-file {`
	`743`	`+ color: @tc-input-placeholder-text;`
	`744`	`+ }`
`741`	`745`	`}`
`742`	`746`
`743`	`747`	`.selected {`
`744`		`- color: @inline-color-3;`
	`748`	`+ color: @tc-light-weight-text;`
`745`	`749`	`transition: color 0.1s ease-out .15s;`
`746`	`750`	`}`
`747`	`751`	`}`