Merge pull request #5443 from VizuaaLOG/inline-editor-close-button

RaymondLim · RaymondLim · commit 8b7d5018cf77 · 2013-10-10T13:56:44.000-07:00
Inline Editor Close Button
diff --git a/src/editor/InlineTextEditor.js b/src/editor/InlineTextEditor.js
@@ -210,6 +210,7 @@ define(function (require, exports, module) {
         
         // header containing filename, dirty indicator, line number
         var $header = $("<div/>").addClass("inline-editor-header");
+        
         var $filenameInfo = $("<a/>").addClass("filename");
         
         // dirty indicator, with file path stored on it
diff --git a/src/editor/InlineWidget.js b/src/editor/InlineWidget.js
@@ -43,8 +43,16 @@ define(function (require, exports, module) {
         this.htmlContent = window.document.createElement("div");
         this.$htmlContent = $(this.htmlContent).addClass("inline-widget");
         this.$htmlContent.append("<div class='shadow top' />")
-            .append("<div class='shadow bottom' />");
-        
+            .append("<div class='shadow bottom' />")
+            .append("<a href='#' class='close'>&times;</a>");
+
+        // create the close button
+        this.$closeBtn = this.$htmlContent.find(".close");
+        this.$closeBtn.click(function (e) {
+            self.close();
+            e.stopImmediatePropagation();
+        });
+
         this.$htmlContent.on("keydown", function (e) {
             if (e.keyCode === KeyEvent.DOM_VK_ESCAPE) {
                 self.close();
diff --git a/src/styles/brackets.less b/src/styles/brackets.less
@@ -672,6 +672,15 @@ a, img {
             background-color: @inline-background-color-1;
         }
     }
+
+    .close {
+        position: relative;
+        float: left;
+        left: 15px;
+        top: 10px;
+        margin-right: 30px;
+    }
+
 }
 
 /* CSSInlineEditor rule list */

Original file line number	Diff line number	Diff line change
`@@ -672,6 +672,15 @@ a, img {`
`672`	`672`	`background-color: @inline-background-color-1;`
`673`	`673`	`}`
`674`	`674`	`}`
	`675`	`+`
	`676`	`+ .close {`
	`677`	`+ position: relative;`
	`678`	`+ float: left;`
	`679`	`+ left: 15px;`
	`680`	`+ top: 10px;`
	`681`	`+ margin-right: 30px;`
	`682`	`+ }`
	`683`	`+`
`675`	`684`	`}`
`676`	`685`
`677`	`686`	`/* CSSInlineEditor rule list */`