Merge lp:~hiroshidi/ubuntu-terminal-app/font-size-fix into lp:ubuntu-terminal-app

[Dmitry Zagnoyko]

Default font changed to 14 (LP: #1187015)

Quick fix for LP: #1187015

[Michael Hall (mhall119)]

Looks good to me

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'config/JsConfig.qml'
--- config/JsConfig.qml	2013-04-30 22:05:00 +0000
+++ config/JsConfig.qml	2013-06-03 16:30:39 +0000
@@ -18,13 +18,13 @@
 
     //FontSize
     function getFontSize(){
-        var res = dbEngine.getConfig("fontSize");
-        if( res === "UNKNOWN" ) return "12";
-        return res;
+        var res =  dbEngine.getConfig("fontSize");
+        if( res === "UNKNOWN" || res === "NaN" ) return 14;
+        else return parseInt(res);
     }
 
     function setFontSize(size){
-        dbEngine.setConfig("fontSize",size);
+        dbEngine.setConfig("fontSize",size.toString() );
     }
 
 }