aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/tree-basic/treeItem.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-28 13:58:31 -0700
committerJose Antonio Marquez2012-03-28 13:58:31 -0700
commit02bb0b7d1f0b9d5a4e1c85315f026c437b2808f3 (patch)
tree88c96e3f87729a873af7fc88379f4935e83306ed /js/components/ui/tree-basic/treeItem.reel
parent67d5f237cafd738892cdda51e5742afb0534149b (diff)
parent3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff)
downloadninja-02bb0b7d1f0b9d5a4e1c85315f026c437b2808f3.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/ui/tree-basic/treeItem.reel')
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.css2
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.css b/js/components/ui/tree-basic/treeItem.reel/treeItem.css
index f8e67541..d33404e7 100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.css
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.css
@@ -29,7 +29,7 @@
29} 29}
30 30
31.atreeItem .name{ 31.atreeItem .name{
32 white-space: nowrap; 32 white-space: pre;
33 text-overflow:ellipsis; 33 text-overflow:ellipsis;
34 line-height:15px; 34 line-height:15px;
35 overflow: hidden; 35 overflow: hidden;
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.js b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
index 13e278e9..e9e5c1fb 100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.js
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
@@ -118,7 +118,7 @@ exports.TreeItem = Montage.create(Component, {
118 this.metadata = "Name: "+this.treeItemData.name; 118 this.metadata = "Name: "+this.treeItemData.name;
119 } 119 }
120 this.metadata = this.metadata + "<br />" + "Type: "+this.treeItemData.type; 120 this.metadata = this.metadata + "<br />" + "Type: "+this.treeItemData.type;
121 if(this.treeItemData.size){this.metadata = this.metadata + "<br />" + "Size: "+this.treeItemData.size;} 121 if(this.treeItemData.size){this.metadata = this.metadata + "<br />" + "Size: "+this.treeItemData.size+ " bytes";}
122 if(this.treeItemData.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.treeItemData.creationDate);} 122 if(this.treeItemData.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.treeItemData.creationDate);}
123 if(this.treeItemData.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.treeItemData.modifiedDate);} 123 if(this.treeItemData.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.treeItemData.modifiedDate);}
124 124