From 16faed74cfb7b1edb1a21b012ee223c4285454ab Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 27 Nov 2020 16:29:08 +0100 Subject: [PATCH] wip #4099 @0.5 --- js/libs/fluidbook/cart/fluidbook.cart.mopec.js | 6 ++++++ js/libs/scorm/scorm.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/js/libs/fluidbook/cart/fluidbook.cart.mopec.js b/js/libs/fluidbook/cart/fluidbook.cart.mopec.js index eddbc5a3..39f59e2d 100644 --- 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 201f9795..6e2dcaaf 100644 --- 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) { -- 2.39.5