Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1394723 into lp:ubuntu-docviewer-app/trunk

[Stefano Verzegnassi]

Fixed document size format

Fixed document size format

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:44
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/104/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/408
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/408/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-vivid-amd64-ci/7

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/104/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

Looks ok for me.

[Bartosz Kosiorek (gang65)]

review: Approve

=== modified file 'src/app/qml/utils.js'
--- src/app/qml/utils.js	2014-10-20 18:45:09 +0000
+++ src/app/qml/utils.js	2014-12-04 08:10:20 +0000
@@ -4,26 +4,23 @@
 {
     if (size >= 1073741824)
     {
-        return parseInt(size/1073741824) + "," + size%1073741824 + " Gio";
+        return (size / 1073741824).toFixed(2) + " GiB";
     }
 
     if (size >= 1048576)
     {
-        return parseInt(size/1048576) + "," + size%1048576 + " Mio";
+        return (size / 1048576).toFixed(2) + " MiB";
     }
 
     if (size >= 1024)
     {
-        return parseInt(size/1024) + "," + size%1024 + " Kio";
+        return parseInt(size / 1024) + " KiB";
     }
 
-    return size + " o";
+    return size + " byte";
 }
 
 function getNameOfFile(path)
 {
-    var name = String(path);
-
-    return name.substring(name.lastIndexOf('/')+1);
-
+    return path.toString().substring(path.lastIndexOf('/') + 1);
 }