make values with white spaces possible

a user might enter values with white spaces, and that should be possible
and valid

Signed-off-by: Artur Neumann <info@individual-it.net>

diff --git a/core/js/js.js b/core/js/js.js
index ba831e4251d3800b2ae2ccd1289bcb15d82a3132..44204f438c56c8b952cc7a3570867cd01f6b4b98 100644 (file)
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1682,7 +1682,7 @@ OC.Util = {
                        return null;
                }
 
-               var s = string.toLowerCase();
+               var s = string.toLowerCase().trim();
                var bytes = null;
 
                var bytesArray = {

diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index faafb4797be215dc6c52a67bc0453464920dea6b..c9e8a60f2f16d899bf021196896e4a1fcd20b767 100644 (file)
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -619,6 +619,13 @@ describe('Core base tests', function() {
                                        ['B', null],
                                        ['40/0', null],
                                        ['40,30 kb', null],
+                                       [' 122.1 MB ', 128031130],
+                                       ['122.1 MB ', 128031130],
+                                       [' 122.1 MB ', 128031130],
+                                       ['      122.1 MB ', 128031130],
+                                       ['122.1    MB ', 128031130],
+                                       [' 125', 125],
+                                       [' 125 ', 125],
                                ];
                                for (var i = 0; i < data.length; i++) {
                                        expect(OC.Util.computerFileSize(data[i][0])).toEqual(data[i][1]);