wip #4099 @0.5

diff --git a/js/libs/fluidbook/cart/fluidbook.cart.mopec.js b/js/libs/fluidbook/cart/fluidbook.cart.mopec.js
index eddbc5a35ea1d1532cee7ad98345184e1160781e..39f59e2d03920f37db5a978ccdd520bc26c6017a 100644 (file)
--- a/js/libs/fluidbook/cart/fluidbook.cart.mopec.js
+++ b/js/libs/fluidbook/cart/fluidbook.cart.mopec.js
@@ -236,6 +236,12 @@ FluidbookCartMopec.prototype = {
                         if (e.min !== undefined) {
                             min = e.min;
                         }
+                        // } else {
+                        //     var m = e.name.match(/, min[\,\.]([\d+])/);
+                        //     if (m != null) {
+                        //         min = m[1];
+                        //     }
+                        // }
                         console.log('set min qty for ' + sku + ' : ' + min)
                         $this.minQuantities[sku] = min;
                         return false;

diff --git a/js/libs/scorm/scorm.js b/js/libs/scorm/scorm.js
index 201f97958ac38a5d984148f76d8e01f5314ab84a..6e2dcaafb0d3694f13a599f4fd643bad045532e2 100644 (file)
--- a/js/libs/scorm/scorm.js
+++ b/js/libs/scorm/scorm.js
@@ -110,7 +110,7 @@ function initScormEvents() {
                 }
             } else if (currentLocation.indexOf('{') === 0) {
                 var location = JSON.parse(currentLocation);
-                if (location.maxPage) {
+                if (location.maxPage && fluidbook.settings.hasContentLock) {
                     fluidbook.contentlock.setMaxPage(location.maxPage, true);
                 }
                 if (location.page) {