cnx-public/scorm-again
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Still trying to make sure that cmi is sorted properly

Browse Source
This commit is contained in:
Jonathan Putney
2020-07-30 12:13:15 -04:00
parent a66712d3b4
commit 6c96dadbce
4 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/scorm-again.js
Vendored
+17 -9
View File
File diff suppressed because one or more lines are too long
dist/scorm-again.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/scorm-again.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
src/BaseAPI.js
+13 -12
View File
@@ -870,18 +870,11 @@ export default class BaseAPI {
* @return {number} * @return {number}
*/ */
function testPattern(a, c, a_pattern, c_pattern) { function testPattern(a, c, a_pattern, c_pattern) {
if (a.match(a_pattern) && c.match(c_pattern)) { if (a.match(c_pattern) && c.match(a_pattern)) {
if (Number(a.match(a_pattern)[1]) < const a1 = Number(a.match(c_pattern)[1]);
Number(c.match(c_pattern)[1])) return -1; const c1 = Number(c.match(a_pattern)[1]);
if (Number(a.match(a_pattern)[1]) > if (a1 === c1) return -1;
Number(c.match(c_pattern)[1])) return 1; else return 1;
return -1;
} else if (a.match(c_pattern) && c.match(a_pattern)) {
if (Number(a.match(c_pattern)[1]) <
Number(c.match(a_pattern)[1])) return -1;
if (Number(a.match(c_pattern)[1]) >
Number(c.match(a_pattern)[1])) return 1;
return 1;
} }
return 0; return 0;
} }
@@ -896,10 +889,18 @@ export default class BaseAPI {
if (id_test !== 0) { if (id_test !== 0) {
return id_test; return id_test;
} }
id_test = testPattern(a, c, int_pattern, int_id_pattern);
if (id_test !== 0) {
return id_test;
}
id_test = testPattern(a, c, int_type_pattern, int_pattern); id_test = testPattern(a, c, int_type_pattern, int_pattern);
if (id_test !== 0) { if (id_test !== 0) {
return id_test; return id_test;
} }
id_test = testPattern(a, c, int_pattern, int_type_pattern);
if (id_test !== 0) {
return id_test;
}
id_test = testPattern(a, c, obj_id_pattern, obj_pattern); id_test = testPattern(a, c, obj_id_pattern, obj_pattern);
if (id_test !== 0) { if (id_test !== 0) {
return id_test; return id_test;