From 81f369c6e38e181bddc29c42a6a7967c6b4879c6 Mon Sep 17 00:00:00 2001 From: Nicholas Brien Date: Thu, 7 Aug 2014 11:45:52 +0200 Subject: [PATCH] Aligning the Byte Sizes with Ruby for displays --- .../jquery-fileupload/jquery.fileupload-angular.js | 8 ++++---- .../jquery-fileupload/jquery.fileupload-ui.js | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js b/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js index e7ba784..a6eea05 100755 --- a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js +++ b/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js @@ -126,12 +126,12 @@ .provider('formatFileSizeFilter', function () { var $config = this.defaults = { - // Byte units following the IEC format + // Byte units following the Ruby Format (IEC) // http://en.wikipedia.org/wiki/Kilobyte units: [ - {size: 1000000000, suffix: ' GB'}, - {size: 1000000, suffix: ' MB'}, - {size: 1000, suffix: ' KB'} + {size: 1073741824, suffix: ' GB'}, + {size: 1048576, suffix: ' MB'}, + {size: 1024, suffix: ' KB'} ] }; this.$get = function () { diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js b/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js index 5d22346..31397e0 100755 --- a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js +++ b/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js @@ -355,13 +355,13 @@ if (typeof bytes !== 'number') { return ''; } - if (bytes >= 1000000000) { - return (bytes / 1000000000).toFixed(2) + ' GB'; + if (bytes >= 1073741824) { + return (bytes / 1073741824).toFixed(2) + ' GB'; } - if (bytes >= 1000000) { - return (bytes / 1000000).toFixed(2) + ' MB'; + if (bytes >= 1048576) { + return (bytes / 1048576).toFixed(2) + ' MB'; } - return (bytes / 1000).toFixed(2) + ' KB'; + return (bytes / 1024).toFixed(2) + ' KB'; }, _formatBitrate: function (bits) {