Skip to content
This repository was archived by the owner on Jul 5, 2023. It is now read-only.

Commit 717910d

Browse files
committed
Merge branch 'hotfix/2.3.11'
2 parents cb83d9a + 728ea45 commit 717910d

File tree

5 files changed

+25
-18
lines changed

5 files changed

+25
-18
lines changed

CHANGELOG.markdown

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## v2.3.11
2+
3+
* [Fix #167][i167] — bug in rounding when displaying "humanized" sizes.
4+
5+
[i167]: https://github.com/bobthecow/genghis/issues/167
6+
7+
18
## v2.3.10
29

310
* [Fix #145][i145], [#148][i148] — work around rack-protection's misguided path decoding.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.10
1+
2.3.11

genghis.php

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

genghis.rb

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

src/js/genghis/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Genghis.Util = {
2828
var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)), 10);
2929

3030
var size = (i === 0) ? (bytes / Math.pow(1024, i)) : (bytes / Math.pow(1024, i)).toFixed(1);
31-
size = Genghis.Util.round(size, 2).toString().replace(/\.0+/, '');
31+
size = Genghis.Util.round(size, 2).toString().replace(/\.0+$/, '');
3232

3333
return size + ' ' + sizes[i];
3434
},

0 commit comments

Comments
 (0)