aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
diff options
context:
space:
mode:
authorJonathan Duran2012-03-29 07:27:27 -0700
committerJonathan Duran2012-03-29 07:27:27 -0700
commitab730848419a0b72c4c2747a3c928f2c8cc763e7 (patch)
tree6b48b82604e194016ca048ad912f8015de719999 /js/components/ui
parent06f247d881f4cfd790d635c6e310ae7f97724339 (diff)
parent3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff)
downloadninja-ab730848419a0b72c4c2747a3c928f2c8cc763e7.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/ui')
-rw-r--r--js/components/ui/icon-list-basic/icon.reel/icon.css2
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js2
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.css2
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.js2
4 files changed, 4 insertions, 4 deletions
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css
index 9fb180d2..203db65c 100644
--- a/js/components/ui/icon-list-basic/icon.reel/icon.css
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.css
@@ -35,7 +35,7 @@
35 35
36.icon .iconLabel{ 36.icon .iconLabel{
37 margin-top:8px; 37 margin-top:8px;
38 white-space: nowrap; 38 white-space: pre;
39 text-overflow: ellipsis; 39 text-overflow: ellipsis;
40 line-height:15px; 40 line-height:15px;
41 overflow: hidden; 41 overflow: hidden;
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index 1ef6e277..7d36bc59 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -86,7 +86,7 @@ var Icon = exports.Icon = Montage.create(Component, {
86 this.metadata = "Name: "+this.icondata.name; 86 this.metadata = "Name: "+this.icondata.name;
87 } 87 }
88 this.metadata = this.metadata + "<br />" + "Type: "+this.icondata.type; 88 this.metadata = this.metadata + "<br />" + "Type: "+this.icondata.type;
89 if(this.icondata.size){this.metadata = this.metadata + "<br />" + "Size: "+this.icondata.size;} 89 if(this.icondata.size){this.metadata = this.metadata + "<br />" + "Size: "+this.icondata.size+ " bytes";}
90 if(this.icondata.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.icondata.creationDate);} 90 if(this.icondata.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.icondata.creationDate);}
91 if(this.icondata.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.icondata.modifiedDate);} 91 if(this.icondata.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.icondata.modifiedDate);}
92 92
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