Ticket #1728: 1728.2.patch

src/widget/templates/TreeV3.css

@@ -37 +37 @@
 */
 
 .TreeExpandLoading   {
-    width: 18px;
-    height: 18px;
-    float: left;
-    display: inline;
     background-repeat : no-repeat;
     background-image: url('../templates/images/TreeV3/expand_loading.gif');
 }
@@ -48 +44 @@
 .TreeContent {
     min-height: 18px;
     min-width: 18px;
-    margin-left:18px;
+    margin-left:0px;
     cursor: default;
     /* can't make inline - multiline bugs */
+    background-repeat : no-repeat;
 }
 
 .TreeIEContent {
         height: 18px;
 }
  
-.TreeExpand {
-    width: 18px;
-    height: 18px;
-    float: left;
-    display: inline;
-    background-repeat : no-repeat;
+.TreeLabel {
+    left: 18px;
+    position: relative;
 }
- 
+
 /* same style as IE selection */
 .TreeNodeEmphasized {
     background-color: Highlight;
     color: HighlightText;
 }
+ 
+.TreeContent .RichTextEditable, .TreeContent .RichTextEditable iframe {
+      background-color: #ffc;
+      color: black;
+}
 
 /* don't use :focus due to opera's lack of support on div's */
 .TreeLabelFocused {

src/widget/TreeBasicControllerV3.js

@@ -318 +318 @@
                 }
         },
 
-    onTreeMouseDown: function(e) {
-    },
+        onTreeMouseDown: function(e) {
+        },
 
         onTreeClick: function(e){
                 //dojo.profile.start("onTreeClick");
@@ -327 +327 @@
                 var domElement = e.target;
                 //dojo.debug('click')
                 // find node
-        var node = this.domElement2TreeNode(domElement);                
+                var node = this.domElement2TreeNode(domElement);                
                 if (!node || !node.isTreeNode) {
                         return;
                 }
                 
                 
-                var checkExpandClick = function(el) {
-                        return el === node.expandNode;
-                }
+                if (domElement == node.contentNode) {
+                        var checkExpandClick = function(el) {
+                                return el === node.contentNode;
+                        }
                 
-                if (this.checkPathCondition(domElement, checkExpandClick)) {
-                        this.processExpandClick(node);                  
+                        if (this.checkPathCondition(domElement, checkExpandClick)) {
+                                var y = e.pageY - dojo.html.getAbsolutePosition(node.labelNode, true, dojo.html.boxSizing.MARGIN_BOX).y;
+                                if (y <= dojo.html.getPixelValue (node.labelNode,"left")){
+                                        this.processExpandClick(node);                  
+                                }
+                        }
                 }
                 
                 this._focusLabel(node);

src/widget/TreeNodeV3.js

@@ -30 +30 @@
         labelClass: "",
         contentClass: "",
 
-        expandNode: null,
         labelNode: null,
                 
     /**
@@ -98 +97 @@
                                 
                         
         markProcessing: function() {
-                this.markProcessingSavedClass = dojo.html.getClass(this.expandNode);
-                dojo.html.setClass(this.expandNode, this.tree.classPrefix+'ExpandLoading');                     
+                this.markProcessingSavedClass = dojo.html.getClass(this.contentNode);
+                dojo.html.setClass(this.contentNode, this.tree.classPrefix+'ExpandLoading');                    
         },
         
         unmarkProcessing: function() {
-                dojo.html.setClass(this.expandNode, this.markProcessingSavedClass);                     
+                dojo.html.setClass(this.contentNode, this.markProcessingSavedClass);                    
         },
         
         
@@ -129 +128 @@
                 //dojo.profile.start("buildRendering - cloneNode");
                 
                 this.domNode = this.tree.nodeTemplate.cloneNode(true);
-                this.expandNode = this.domNode.firstChild;
-                this.contentNode = this.domNode.childNodes[1];
+                this.contentNode = this.domNode.firstChild;
                 this.labelNode = this.contentNode.firstChild;
                 
                 if (this.labelClass) {

src/widget/TreeV3.js

@@ -119 +119 @@
         },
                                 
 
-        // expandNode has +- CSS background. Not img.src for performance, background src string resides in single place.
+        // contentNode has +- CSS background. Not img.src for performance, background src string resides in single place.
         // selection in KHTML/Mozilla disabled treewide, IE requires unselectable for every node
         // you can add unselectable if you want both in postCreate of tree and in this template
 
@@ -130 +130 @@
                 dojo.html.setClass(domNode, this.classPrefix+"Node "+this.classPrefix+"ExpandLeaf "+this.classPrefix+"ChildrenNo");             
                 this.nodeTemplate = domNode;
                 
-                var expandNode = document.createElement("div");
+                var contentNode = document.createElement("div");
                 var clazz = this.classPrefix+"Expand";
                 if (dojo.render.html.ie) {
                         clazz = clazz + ' ' + this.classPrefix+"IEExpand";
                 }
-                dojo.html.setClass(expandNode, clazz);
+                dojo.html.setClass(contentNode, clazz);
                 
-                this.expandNodeTemplate = expandNode;
-
-                // need <span> inside <div>
-                // div for multiline support, span for styling exactly the text, not whole line
-                var labelNode = document.createElement("span");
+                var labelNode = document.createElement("div");
                 dojo.html.setClass(labelNode, this.classPrefix+"Label");
                 this.labelNodeTemplate = labelNode;
                 
-                var contentNode = document.createElement("div");
                 var clazz = this.classPrefix+"Content";
                 
                 /**
@@ -158 +153 @@
                 }       
                 
                                 
-                dojo.html.setClass(contentNode, clazz);
+                dojo.html.addClass(contentNode, clazz);
                 
                 this.contentNodeTemplate = contentNode;
-                
-                domNode.appendChild(expandNode);
+
                 domNode.appendChild(contentNode);
                 contentNode.appendChild(labelNode);
                 
-                
         },
 
         makeContainerNodeTemplate: function() {