comparison interfaces/ape.js @ 2396:dc13bd68ea34

Fix for #93 for all interfaces which have outside-reference (all except ABX)
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Thu, 26 May 2016 09:35:07 +0100
parents 521e828089eb
children b7ed9d43ea87
comparison
equal deleted inserted replaced
2395:dde1f3254762 2396:dc13bd68ea34
258 interfaceButtons.appendChild(submit); 258 interfaceButtons.appendChild(submit);
259 259
260 var sliderHolder = document.createElement("div"); 260 var sliderHolder = document.createElement("div");
261 sliderHolder.id = "slider-holder"; 261 sliderHolder.id = "slider-holder";
262 262
263 // Create outside reference holder
264 var outsideRef = document.createElement("div");
265 outsideRef.id = "outside-reference-holder";
263 266
264 // Global parent for the comment boxes on the page 267 // Global parent for the comment boxes on the page
265 var feedbackHolder = document.createElement('div'); 268 var feedbackHolder = document.createElement('div');
266 feedbackHolder.id = 'feedbackHolder'; 269 feedbackHolder.id = 'feedbackHolder';
267 270
269 interfaceContext.insertPoint.innerHTML = ""; // Clear the current schema 272 interfaceContext.insertPoint.innerHTML = ""; // Clear the current schema
270 273
271 // Inject into HTML 274 // Inject into HTML
272 testContent.appendChild(title); // Insert the title 275 testContent.appendChild(title); // Insert the title
273 testContent.appendChild(interfaceButtons); 276 testContent.appendChild(interfaceButtons);
277 testContent.appendChild(outsideRef);
274 testContent.appendChild(sliderHolder); 278 testContent.appendChild(sliderHolder);
275 testContent.appendChild(feedbackHolder); 279 testContent.appendChild(feedbackHolder);
276 interfaceContext.insertPoint.appendChild(testContent); 280 interfaceContext.insertPoint.appendChild(testContent);
277 281
278 // Load the full interface 282 // Load the full interface
293 var sliderHolder = document.getElementById('slider-holder'); 297 var sliderHolder = document.getElementById('slider-holder');
294 feedbackHolder.innerHTML = ""; 298 feedbackHolder.innerHTML = "";
295 sliderHolder.innerHTML = ""; 299 sliderHolder.innerHTML = "";
296 300
297 // Delete outside reference 301 // Delete outside reference
298 var outsideReferenceHolder = document.getElementById('outside-reference'); 302 document.getElementById("outside-reference-holder").innerHTML = "";
299 if (outsideReferenceHolder != null) {
300 document.getElementById('interface-buttons').removeChild(outsideReferenceHolder);
301 }
302 303
303 var interfaceObj = audioHolderObject.interfaces; 304 var interfaceObj = audioHolderObject.interfaces;
304 for (var k=0; k<interfaceObj.length; k++) { 305 for (var k=0; k<interfaceObj.length; k++) {
305 // Create the div box to center align 306 // Create the div box to center align
306 interfaceContext.interfaceSliders.push(new interfaceSliderHolder(interfaceObj[k])); 307 interfaceContext.interfaceSliders.push(new interfaceSliderHolder(interfaceObj[k]));
359 var audioObject = audioEngineContext.newTrack(element); 360 var audioObject = audioEngineContext.newTrack(element);
360 // Check if an outside reference 361 // Check if an outside reference
361 if (element.type == 'outside-reference') 362 if (element.type == 'outside-reference')
362 { 363 {
363 // Construct outside reference; 364 // Construct outside reference;
364 var orNode = new outsideReferenceDOM(audioObject,index,document.getElementById('interface-buttons')); 365 var orNode = new outsideReferenceDOM(audioObject,index,document.getElementById("outside-reference-holder"));
365 audioObject.bindInterface(orNode); 366 audioObject.bindInterface(orNode);
366 } else { 367 } else {
367 // Create a slider per track 368 // Create a slider per track
368 var sliderNode = new sliderObject(audioObject,interfaceObj,index); 369 var sliderNode = new sliderObject(audioObject,interfaceObj,index);
369 audioObject.bindInterface(sliderNode); 370 audioObject.bindInterface(sliderNode);
702 { 703 {
703 if (progress != 100) 704 if (progress != 100)
704 { 705 {
705 progress = String(progress); 706 progress = String(progress);
706 progress = progress.split('.')[0]; 707 progress = progress.split('.')[0];
707 this.outsideReferenceHolder[0].children[0].textContent = progress+'%'; 708 this.outsideReferenceHolder.firstChild.textContent = progress+'%';
708 } else { 709 } else {
709 this.outsideReferenceHolder[0].children[0].textContent = "Play Reference"; 710 this.outsideReferenceHolder.firstChild.textContent = "Play Reference";
710 } 711 }
711 }; 712 };
712 this.startPlayback = function() 713 this.startPlayback = function()
713 { 714 {
714 $('.track-slider').removeClass('track-slider-playing'); 715 $('.track-slider').removeClass('track-slider-playing');