comparison interfaces/ape.js @ 2795:b4735c529a8e

Minor compile issues in APE
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Sun, 23 Apr 2017 11:17:05 +0100
parents cae61c5bbed1
children 35037fb7a843
comparison
equal deleted inserted replaced
2794:b4e91500891a 2795:b4735c529a8e
104 var range = sliderHolder.sliders.reduce(function (a, b) { 104 var range = sliderHolder.sliders.reduce(function (a, b) {
105 var v = convSliderPosToRate(b) * 100.0; 105 var v = convSliderPosToRate(b) * 100.0;
106 return { 106 return {
107 min: Math.min(a.min, v), 107 min: Math.min(a.min, v),
108 max: Math.max(a.max, v) 108 max: Math.max(a.max, v)
109 } 109 };
110 }, { 110 }, {
111 min: 100, 111 min: 100,
112 max: 0 112 max: 0
113 }); 113 });
114 if (range.min >= scales.min || range.max <= scales.max) { 114 if (range.min >= scales.min || range.max <= scales.max) {
251 document.getElementById("outside-reference-holder").innerHTML = ""; 251 document.getElementById("outside-reference-holder").innerHTML = "";
252 252
253 var interfaceObj = interfaceContext.getCombinedInterfaces(audioHolderObject); 253 var interfaceObj = interfaceContext.getCombinedInterfaces(audioHolderObject);
254 interfaceObj.forEach(function (interfaceObjectInstance) { 254 interfaceObj.forEach(function (interfaceObjectInstance) {
255 // Create the div box to center align 255 // Create the div box to center align
256 interfaceContext.interfaceSliders.push(new interfaceSliderHolder(interfaceObjectInstance)); 256 interfaceContext.interfaceSliders.push(new interfaceSliderHolder(interfaceObjectInstance, audioHolderObject));
257 }); 257 });
258 interfaceObj.forEach(function (interface) { 258 interfaceObj.forEach(function (interface) {
259 interface.options.forEach(function (option) { 259 interface.options.forEach(function (option) {
260 if (option.type == "show") { 260 if (option.type == "show") {
261 switch (option.name) { 261 switch (option.name) {
445 }); 445 });
446 446
447 //testWaitIndicator(); 447 //testWaitIndicator();
448 } 448 }
449 449
450 function interfaceSliderHolder(interfaceObject) { 450 function interfaceSliderHolder(interfaceObject, page) {
451 this.sliders = []; 451 this.sliders = [];
452 this.metrics = []; 452 this.metrics = [];
453 this.id = document.getElementsByClassName("sliderCanvasDiv").length; 453 this.id = document.getElementsByClassName("sliderCanvasDiv").length;
454 this.name = interfaceObject.name; 454 this.name = interfaceObject.name;
455 this.interfaceObject = interfaceObject; 455 this.interfaceObject = interfaceObject;
462 imageController.root.className = "imageController"; 462 imageController.root.className = "imageController";
463 imageController.img = document.createElement("img"); 463 imageController.img = document.createElement("img");
464 imageController.root.appendChild(imageController.img); 464 imageController.root.appendChild(imageController.img);
465 imageController.setImage = function (src) { 465 imageController.setImage = function (src) {
466 imageController.img.src = ""; 466 imageController.img.src = "";
467 if (typeof src !== "string" || src.length == undefined) { 467 if (typeof src !== "string" || src.length === undefined) {
468 return; 468 return;
469 } 469 }
470 imageController.img.src = src; 470 imageController.img.src = src;
471 } 471 };
472 return imageController; 472 return imageController;
473 })(); 473 })();
474 474
475 var pagetitle = document.createElement('div'); 475 var pagetitle = document.createElement('div');
476 pagetitle.className = "pageTitle"; 476 pagetitle.className = "pageTitle";
483 titleSpan.textContent = "Axis " + String(this.id + 1); 483 titleSpan.textContent = "Axis " + String(this.id + 1);
484 } 484 }
485 pagetitle.appendChild(titleSpan); 485 pagetitle.appendChild(titleSpan);
486 this.sliderDOM.appendChild(pagetitle); 486 this.sliderDOM.appendChild(pagetitle);
487 487
488 if (interfaceObject.image !== undefined) { 488 if (interfaceObject.image !== undefined || page.audioElements.some(function (a) {
489 return a.image !== undefined;
490 })) {
489 this.sliderDOM.appendChild(this.imageHolder.root); 491 this.sliderDOM.appendChild(this.imageHolder.root);
490 this.imageHolder.setImage(interfaceObject.image); 492 this.imageHolder.setImage(interfaceObject.image);
491 } 493 }
492 // Create the slider box to hold the slider elements 494 // Create the slider box to hold the slider elements
493 this.canvas = document.createElement('div'); 495 this.canvas = document.createElement('div');
731 if (interfaceContext.checkHiddenReference() === false) { 733 if (interfaceContext.checkHiddenReference() === false) {
732 return; 734 return;
733 } 735 }
734 736
735 for (var i = 0; i < checks.length; i++) { 737 for (var i = 0; i < checks.length; i++) {
738 var checkState = true;
736 if (checks[i].type == 'check') { 739 if (checks[i].type == 'check') {
737 var checkState = true;
738 switch (checks[i].name) { 740 switch (checks[i].name) {
739 case 'fragmentPlayed': 741 case 'fragmentPlayed':
740 // Check if all fragments have been played 742 // Check if all fragments have been played
741 checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage); 743 checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage);
742 break; 744 break;