diff options
| author | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
| commit | ab730848419a0b72c4c2747a3c928f2c8cc763e7 (patch) | |
| tree | 6b48b82604e194016ca048ad912f8015de719999 /js/components/ui/icon-list-basic/icon.reel/icon.js | |
| parent | 06f247d881f4cfd790d635c6e310ae7f97724339 (diff) | |
| parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
| download | ninja-ab730848419a0b72c4c2747a3c928f2c8cc763e7.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/ui/icon-list-basic/icon.reel/icon.js')
| -rwxr-xr-x | js/components/ui/icon-list-basic/icon.reel/icon.js | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||