sync the console with the suite

toolkit/components/console/content/console.css

@@ -17,18 +17,18 @@
   -moz-binding: url("chrome://global/content/consoleBindings.xml#message");
 }
 
-.console-error-msg {
-  white-space: normal;
-}
-    
 .console-msg-text {
-  white-space: pre;
+  white-space: -moz-pre-wrap;
 }  
 
 .console-error-source {
   -moz-binding: url("chrome://global/content/consoleBindings.xml#console-error-source");
 }
   
+.console-dots {
+  width: 1px;
+}
+
 /* :::::::::: hiding and showing of rows for each mode :::::::::: */
 
 .console-box[mode="Warnings"] > .console-box-internal > .console-rows 

toolkit/components/console/content/console.xul

@@ -45,6 +45,7 @@
               events="select"
               oncommandupdate="updateCopyMenu()">
     <command id="cmd_copy" oncommand="copyItemToClipboard()"/>
+    <command id="cmd_close" oncommand="window.close()"/>
   </commandset>
 
   <broadcaster id="Console:clear" label="&clear.label;" 
@@ -73,14 +74,11 @@
   </broadcasterset>
 
   <keyset>
-    <key id="key_copy" 
-         key="&copyCmd.commandkey;" 
-         modifiers="accel"
+    <key id="key_copy"  key="&copyCmd.commandkey;"  modifiers="accel"
          command="cmd_copy"/>
-    <key id="key_close"
-         key="&closeCmd.commandkey;"
-         modifiers="accel"
-         oncommand="window.close()"/>
+    <key id="key_close" key="&closeCmd.commandkey;" modifiers="accel"
+         command="cmd_close"/>
+    <key keycode="VK_ESCAPE" command="cmd_close"/>
     <key id="key_focus1" key="&focus1.commandkey;" modifiers="accel"
          oncommand="gTextBoxEval.focus()"/>
     <key id="key_focus2" key="&focus2.commandkey;" modifiers="alt"

toolkit/components/console/content/consoleBindings.xml

@@ -62,9 +62,7 @@
             this.mSelectedItem.removeAttribute("selected");
           
           this.mSelectedItem = val;
-          if (val)
-            val.setAttribute("selected", "true");
-          document.commandDispatcher.updateCommands("select");
+          val.setAttribute("selected", "true");
         ]]></setter>
       </property>
     
@@ -94,7 +92,6 @@
           this.mMode = this.getAttribute("mode") || "All";
 
           this.appendInitialItems();
-          this.selectedItem = null; // fires command updater
         ]]></body>
       </method>
     
@@ -209,7 +206,6 @@
           var newRows = this.mConsoleRowBox.cloneNode(false);
           this.mConsoleRowBox.parentNode.replaceChild(newRows, this.mConsoleRowBox);
           this.mConsoleRowBox = newRows;
-          this.selectedItem = null;
         ]]></body>
       </method>
             
@@ -298,7 +294,8 @@
           while (target && !("_IsConsoleRow" in target))
             target = target.parentNode;
 
-          this.selectedItem = target;
+          if (target)
+            this.selectedItem = target;
         }
       ]]></handler>
     </handlers>
@@ -313,17 +310,17 @@
         <xul:vbox class="console-row-content" xbl:inherits="selected" flex="1">
           <xul:box class="console-row-msg" align="start">
             <xul:label class="label" xbl:inherits="value=typetext"/>
-            <xul:description class="console-error-msg" xbl:inherits="value=msg" flex="1"/>
+            <xul:description class="console-error-msg" xbl:inherits="xbl:text=msg" flex="1"/>
           </xul:box>
           <xul:box class="console-row-file" xbl:inherits="hidden=hideSource">
             <xul:label class="label" value="&errFile.label;"/>
-            <xul:box class="console-error-source" xbl:inherits="url"/>
+            <xul:box class="console-error-source" xbl:inherits="url,line"/>
             <spacer flex="1"/>
             <xul:label class="label" value="&errLine.label;"/>
             <xul:label class="label" xbl:inherits="value=line" flex="1"/>
           </xul:box>
           <xul:vbox class="console-row-code" xbl:inherits="selected,hidden=hideCode">
-            <xul:label class="monospace console-code" xbl:inherits="value=code"/>
+            <xul:label class="monospace console-code" xbl:inherits="value=code" crop="end"/>
             <xul:box xbl:inherits="hidden=hideCaret">
               <xul:label class="monospace console-dots" xbl:inherits="value=errorDots"/>
               <xul:label class="monospace console-caret" xbl:inherits="value=errorCaret"/>
@@ -371,7 +368,7 @@
         </xul:box>
         <xul:vbox class="console-row-content" xbl:inherits="selected" flex="1">
           <xul:vbox class="console-row-msg" flex="1">
-            <xul:description class="console-msg-text" xbl:inherits="value=msg" flex="1"/>
+            <xul:description class="console-msg-text" xbl:inherits="xbl:text=msg"/>
           </xul:vbox>
         </xul:vbox>
       </xul:box>
@@ -393,9 +390,11 @@
 
     <handlers>
       <handler event="click"><![CDATA[
+          var url = this.getAttribute("url");
+          var line = getAttribute("line");  
           window.openDialog(
             "chrome://global/content/viewSource.xul", "_blank", 
-            "scrollbars,resizable,chrome,dialog=no", this.getAttribute("url"));
+            "all,dialog=no", url, null, null, line);
       ]]></handler>
     </handlers>
   </binding>

toolkit/components/console/jar.mn

@@ -1,8 +1,8 @@
 toolkit.jar:
 *+ content/global/console.js                            (content/console.js)
 *+ content/global/console.xul                           (content/console.xul)
-   content/global/console.css                           (content/console.css)
-   content/global/consoleBindings.xml                   (content/consoleBindings.xml)
++   content/global/console.css                           (content/console.css)
++   content/global/consoleBindings.xml                   (content/consoleBindings.xml)
 
 classic.jar:
 +  skin/classic/global/console/console.css              (skin/console.css)