116341 - asking the column picker column for cell text, r=sspitzer, sr=blake

themes/classic/global/mac/outliner.css

@@ -84,7 +84,8 @@ outlinerbody:-moz-outliner-separator {
 
 /* ::::: outliner columns ::::: */
 
-outlinercol { 
+outlinercol,
+outlinercolpicker { 
   -moz-box-align: center;
   -moz-box-pack: center;
   border: 2px solid;
@@ -107,7 +108,8 @@ outlinercol {
 
 /* ..... internal box ..... */
 
-outlinercol:hover:active {
+outlinercol:hover:active,
+outlinercolpicker:hover:active {
   border-top: 2px solid;
   border-right: 1px solid;
   border-bottom: 1px solid;
@@ -173,7 +175,7 @@ outlinerbody:-moz-outliner-column(insertafter) {
   list-style-image: url("chrome://global/skin/tree/columnpicker.gif");
 }
 
-/* ::::: column picker :::::  */
+/* ::::: twisty :::::  */
 
 outlinerbody:-moz-outliner-twisty {
   padding-right: 2px;

themes/classic/global/win/outliner.css

@@ -93,7 +93,8 @@ outlinerbody:-moz-outliner-separator {
 
 /* ::::: outliner columns ::::: */
 
-outlinercol { 
+outlinercol,
+outlinercolpicker { 
   -moz-box-align: center;
   -moz-box-pack: center;
   border: 2px solid;
@@ -116,7 +117,8 @@ outlinercol {
 
 /* ..... internal box ..... */
 
-outlinercol:hover:active {
+outlinercol:hover:active,
+outlinercolpicker:hover:active {
   border-top: 2px solid;
   border-right: 1px solid;
   border-bottom: 1px solid;
@@ -179,7 +181,7 @@ outlinerbody:-moz-outliner-column(insertafter) {
   list-style-image: url("chrome://global/skin/tree/columnpicker.gif");
 }
 
-/* ::::: column picker :::::  */
+/* ::::: twisty :::::  */
 
 outlinerbody:-moz-outliner-twisty {
   padding-right: 2px;

themes/modern/global/outliner.css

@@ -112,7 +112,8 @@ outlinerbody:-moz-outliner-separator {
 
 /* ::::: outliner columns ::::: */
 
-outlinercol { 
+outlinercol,
+outlinercolpicker {
   -moz-box-align: center;
   -moz-box-pack: center;
   border: 2px solid;
@@ -135,7 +136,8 @@ outlinercol {
 
 /* ..... internal box ..... */
 
-outlinercol:hover:active {
+outlinercol:hover:active,
+outlinercolpicker:hover:active {
   border-top: 2px solid;
   border-right: 1px solid;
   border-bottom: 1px solid;
@@ -198,7 +200,7 @@ outlinerbody:-moz-outliner-column(insertafter) {
   list-style-image: url("chrome://global/skin/tree/columnpicker.gif");
 }
 
-/* ::::: column picker :::::  */
+/* ::::: twisty :::::  */
 
 outlinerbody:-moz-outliner-twisty {
   padding-right: 2px;

xpfe/global/resources/content/bindings/outliner.xml

@@ -567,7 +567,7 @@
   <binding id="outlinercols" extends="chrome://global/content/bindings/outliner.xml#outliner-base">
     <content>
       <children includes="outlinercol|splitter"/>
-      <xul:outlinercol class="outliner-columnpicker outlinercol-image" fixed="true" ordinal="2147483647"/>
+      <xul:outlinercolpicker class="outlinercol-image" fixed="true" ordinal="2147483647"/>
     </content>
   </binding>
 
@@ -668,7 +668,8 @@
             clicked, UNLESS it was a right-click.  We have to do this
             in click rather than mousedown so that you can drag a
             selected group of items */
-
+          
+           if (!col.value) return;
            var column = document.getElementById(col.value);
            var cycler = column.hasAttribute('cycler');
 
@@ -890,7 +891,7 @@
     </handlers>
   </binding>
 
-  <binding id="columnpicker"
+  <binding id="columnpicker" display="xul:button"
            extends="chrome://global/content/bindings/outliner.xml#outliner-base">
     <content>
       <xul:image class="outliner-columnpicker-icon"/>

xpfe/global/resources/content/xul.css

@@ -506,7 +506,7 @@ outlinerrows {
  -moz-binding: url("chrome://global/content/bindings/outliner.xml#outlinerrows");
 }
 
-outlinercol.outliner-columnpicker {
+outlinercolpicker {
   -moz-binding: url("chrome://global/content/bindings/outliner.xml#columnpicker");
 }