wip #4907 @0.25

diff --git a/js/scormpackage.js b/js/scormpackage.js
index 1e0db21dc3443d04e0013f16ed89f726f7a7e8cb..0cdc6d7f0074c1fd1174de4e564311787d7574ab 100644 (file)
--- a/js/scormpackage.js
+++ b/js/scormpackage.js
@@ -111,12 +111,13 @@ function initState() {
         window.savedState = {};
     }
 
-    var defaultState = {completion_status: 'incomplete', success_status: 'unknown', score: 0, location: {}, cmi: {}};
+
     $.each(DATA.modules, function (k, v) {
+        var defaultState = {completion_status: 'incomplete', success_status: 'unknown', score: 0, location: {}, cmi: {}};
         if (window.savedState[v.id] === undefined || window.savedState[v.id] === null) {
             window.savedState[v.id] = defaultState;
         } else {
-            window.savedState[v.id] = $.extend(true, defaultState, window.savedState[v.id])
+            $.extend(true, window.savedState[v.id], defaultState);
         }
     });
 }
@@ -213,8 +214,10 @@ function openSubSCO(id) {
 
 function setModuleState(id, data) {
     console.log('setModuleState', id, JSON.stringify(data));
-    window.savedState[id] = $.extend(true, window.savedState[id], data);
-    console.log(savedState[id]);
+    console.log(JSON.stringify(window.savedState));
+    $.extend(true, window.savedState[id], data);
+    console.log(window.savedState[id]);
+    console.log(JSON.stringify(window.savedState));
     saveStatus();
     setContents();
 }
@@ -244,7 +247,6 @@ function setContents() {
 
     $.each(DATA.modules, function (k, v) {
         var s = window.savedState[v.id];
-
         var tr = $('<tr data-type="' + v.type + '" data-id="' + v.id + '"><td class="i">' + getSpriteIcon('icon-' + v.type) + '</td></tr>');
         $('tbody').append(tr);
         tr.append('<td class="t">' + v.title + '</td>');
@@ -252,7 +254,6 @@ function setContents() {
         tr.append('<td class="c">' + (v.mandatory ? vcheck : xcheck) + '</td>');
         tr.append('<td class="c">' + (s.completion_status === 'completed' ? vcheck : xcheck) + '</td>');
         tr.append('<td class="score c" data-score="' + s.score + '"><div>' + s.score + ' %</div></td>');
-
     });
 }