Skip to content

Commit 78b85bf

Browse files
committed
more tree beauty
1 parent 31aaf3c commit 78b85bf

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

src/modules/files/Tree.js

+15-2
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ define([
7070
domStyle.set(self.rowNode, {
7171
zIndex: 2000 - (self.indent * 2) + 1
7272
});
73+
var expandoBox = domGeo.getMarginBox(this.expandoNode);
7374
domStyle.set(self.backgroundNode, {
7475
zIndex: 2000 - (self.indent * 2)
7576
, height: self._rowBox().h + "px"
77+
, left: expandoBox.l + expandoBox.w
7678
});
7779
}
7880
, _removeFloatStyle: function(){
@@ -111,6 +113,11 @@ define([
111113
return this.indent * this._rowBox().h;
112114
}
113115

116+
, scrollToTop: function(){
117+
var box = domGeo.getMarginBox(this.domNode);
118+
this.tree.domNode.scrollTop = box.t - this.getIndentAddition();
119+
}
120+
114121
, expand: function(){
115122
var res = this.inherited(arguments);
116123
var self = this;
@@ -145,6 +152,12 @@ define([
145152
}
146153
, collapse: function(){
147154
var res = this.inherited(arguments);
155+
if (this._floatStyleAdded){
156+
var self = this;
157+
res.then(function(){
158+
self.scrollToTop();
159+
});
160+
};
148161
this._removeFloat();
149162
return res;
150163
}
@@ -177,8 +190,8 @@ define([
177190

178191
, _onClick: function(/*TreeNode*/ nodeWidget, /*Event*/ e){
179192
if (e.target && domClass.contains(e.target, "treeOpenMore")){
180-
var box = domGeo.getMarginBox(nodeWidget.domNode);
181-
nodeWidget.tree.domNode.scrollTop = box.t - nodeWidget.getIndentAddition();
193+
//var box = domGeo.getMarginBox(nodeWidget.domNode);
194+
nodeWidget.scrollToTop();//tree.domNode.scrollTop = box.t - nodeWidget.getIndentAddition();
182195
e.stopPropagation();
183196
e.preventDefault();
184197
return;

src/modules/files/tree.css

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.dijitTreeNode .backgroundNode {
22
display: none;
33
z-index: -10;
4+
border-bottom-left-radius: 5px;
45
}
56
.dijitTreeNode .dijitTreeRow .moreNode {
67
display: none;

src/modules/files/tree.less

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.backgroundNode {
33
display: none;
44
z-index: -10;
5+
border-bottom-left-radius: 5px;
56
}
67

78
.dijitTreeRow{

0 commit comments

Comments
 (0)