diff options
author | Valerio Virgillito | 2012-03-28 11:56:54 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-28 11:56:54 -0700 |
commit | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (patch) | |
tree | 88c96e3f87729a873af7fc88379f4935e83306ed /js/components/ui/icon-list-basic/icon.reel/icon.js | |
parent | a25e50a429dfa87522ed7616dcae7b472f3c785c (diff) | |
parent | 3571253acb831860d4bc12466b663655bdac652e (diff) | |
download | ninja-3fd2cdb59027b3f973b9165db9db4fdd22026941.tar.gz |
Merge pull request #131 from ananyasen/integration-candidate
Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
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 | ||