Merge branch 'develop'

[lichviet] / qml / LichViet / Settings.js

diff --git a/qml/LichViet/Settings.js b/qml/LichViet/Settings.js
index 242c91d..d08c357 100644 (file)
--- a/qml/LichViet/Settings.js
+++ b/qml/LichViet/Settings.js
@@ -40,6 +40,27 @@ function init_default(){
             ];
 }
 
+function restore_nomodel(){
+    var db = get_db();
+    optsGlobal = [];
+
+    function readEntry(json) {
+        var parsed = JSON.parse(json);
+        optsGlobal.push(parsed);
+    }
+
+    db.transaction( function(tx) {
+                       try {
+                           var rs = tx.executeSql('SELECT * FROM Settings');
+                           for (var i = 0; i < rs.rows.length; i++) {
+                               readEntry(rs.rows.item(i).json)
+                           }
+                       } catch (error) {
+                           init_nomodel();
+                       }
+                   } );
+}
+
 function restore(objmodel){
     var db = get_db();
     objmodel.clear();
@@ -107,6 +128,14 @@ function save(obj){
     store(lopts);
 }
 
+function init_nomodel(){
+    var listopts = init_default();
+    optsGlobal = [];
+    for(var i=0;i< listopts.length;i++){
+        optsGlobal.push(listopts[i]);
+    }
+}
+
 function init(obj){
     var listopts = init_default();
     optsGlobal = [];
@@ -132,7 +161,7 @@ function chedoxoay(){
 function get_opt(idm){
     for(var i=0;i<optsGlobal.length;i++){
         if (optsGlobal[i].idm == idm){
-                if(optsGlobal[i].selected == "true" || optsGlobal[i].selected == true)
+                if(optsGlobal[i].selected == "true" || optsGlobal[i].selected === true)
                     return 1;
         }
     }