Fix error's filename

sixertoy · Aug 31, 2014 · 54371a4 · 54371a4
1 parent a4ba654
commit 54371a4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/htmlContent/panel.html b/htmlContent/panel.html
@@ -5,7 +5,9 @@
         </div>
         <div class="filters">
             <button data-name="debug" class="debug small"><span>debugs</span>&nbsp;<small>(<em></em>)</small></button>
+            {{!--
             <button data-name="warn" class="warn small"><span>warns</span>&nbsp;<small>(<em></em>)</small></button>
+            --}}
             <button data-name="error" class="error small"><span>errors</span>&nbsp;<small>(<em></em>)</small></button>
             <button class="clear">{{CLEAR_LABEL}}</button>
         </div>

diff --git a/htmlContent/row.html b/htmlContent/row.html
@@ -1,10 +1,14 @@
 <li class="line {{even}} {{type}}">
     <span>
         <span>{{message}}</span>
+        {{#shortFileName}}
         <a href="#" title="Open details">{{shortFileName}}</a>
+        {{/shortFileName}}
         <quote>
+            {{#fileName}}
             <b>{{fileName}}</b>
             <em>at line: <b>{{lineNumber}}</b>, column: <b>{{columnNumber}}</b></em>
+            {{/fileName}}
             <span class="stacks">
             {{#errorStacks}}
                 <small>{{.}}</small>

diff --git a/main.js b/main.js
@@ -120,11 +120,11 @@ define(function (require, exports, module) {
         var column = lineAndColumn !== null ? lineAndColumn.length ? lineAndColumn[1] : '' : '';
 
         return {
-            shortFileName: shortFile,
             fileName: file,
             lineNumber: line,
+            errorStacks: traces,
             columnNumber: column,
-            errorStacks: traces
+            shortFileName: shortFile
         };
     }
     /** ------------------------------------

diff --git a/styles/styles.less b/styles/styles.less
@@ -13,7 +13,7 @@
 @green:#ACE539;
 @grey:#999580;
 #brackets-console-panel{
-    &.bottom-panel{
+    &.bottom-panel{ 
         border:0;
         color:@light;
         text-shadow: @shadow;