comparison test_create/test_core.js @ 3136:3dcdada1058f

Fix issue with test scale range not being set.
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Fri, 29 Mar 2019 16:03:06 +0000
parents 1ae8c03dd6a6
children
comparison
equal deleted inserted replaced
3135:afc32cd44b22 3136:3dcdada1058f
441 options.forEach(function (option) { 441 options.forEach(function (option) {
442 var name = option.getAttribute("name"); 442 var name = option.getAttribute("name");
443 var index = $s.interface.options.findIndex(function (io) { 443 var index = $s.interface.options.findIndex(function (io) {
444 return io.name == name; 444 return io.name == name;
445 }); 445 });
446 if (name == "scalerange") {
447 $e[0].querySelector("[name=min]").value = option.getAttribute("min");
448 $e[0].querySelector("[name=max]").value = option.getAttribute("max");
449 }
446 option.querySelector("input").checked = (index >= 0); 450 option.querySelector("input").checked = (index >= 0);
447 if (name == "scalerange" && index >= 0) {
448 option.querySelector("[name=min]").value = $s.interface.options[index].min;
449 option.querySelector("[name=max]").value = $s.interface.options[index].max;
450 }
451 }); 451 });
452 }); 452 });
453 $s.updateScaleRange = function() {
454 var obj = $s.interface.options.find(function(i) {
455 return i.name == "scalerange";
456 });
457 if (obj === undefined) {
458 return;
459 }
460 var min = $e[0].querySelector("[name=min]").value;
461 var max = $e[0].querySelector("[name=max]").value;
462 obj.min = min;
463 obj.max = max;
464 };
453 $s.enableInterfaceOption = function ($event) { 465 $s.enableInterfaceOption = function ($event) {
454 var name = $event.currentTarget.parentElement.getAttribute("name"); 466 var name = $event.currentTarget.parentElement.getAttribute("name");
455 var type = $event.currentTarget.parentElement.getAttribute("type"); 467 var type = $event.currentTarget.parentElement.getAttribute("type");
456 var index = $s.interface.options.findIndex(function (io) { 468 var index = $s.interface.options.findIndex(function (io) {
457 return io.name == name; 469 return io.name == name;
458 }); 470 });
459 if (index == -1 && $event.currentTarget.checked) { 471 if (index == -1 && $event.currentTarget.checked) {
460 var obj = $s.interface.options.push({ 472 var obj = {
461 name: name, 473 name: name,
462 type: type 474 type: type
463 }); 475 };
464 if (name == "scalerange") { 476 if (name == "scalerange") {
465 obj.min = $event.currentTarget.parentElement.querySelector("[name=min]").value; 477 $s.updateScaleRange();
466 obj.max = $event.currentTarget.parentElement.querySelector("[name=max]").value; 478 }
467 } 479 $s.interface.options.push(obj);
468 } else if (index >= 0 && !$event.currentTarget.checked) { 480 } else if (index >= 0 && !$event.currentTarget.checked) {
469 $s.interface.options.splice(index, 1); 481 $s.interface.options.splice(index, 1);
470 } 482 }
471 }; 483 };
472 $s.scales = []; 484 $s.scales = [];