comparison ape.js @ 278:8020152a36af

Pull into main
author Nicholas Jillings <nicholas.jillings@eecs.qmul.ac.uk>
date Fri, 24 Jul 2015 18:59:39 +0100
parents 1077ea830706
children 7e9c38fa7499
comparison
equal deleted inserted replaced
264:4345ba8a1b6e 278:8020152a36af
310 playbackHolder.style.width = "100%"; 310 playbackHolder.style.width = "100%";
311 playbackHolder.align = 'center'; 311 playbackHolder.align = 'center';
312 playbackHolder.appendChild(interfaceContext.playhead.object); 312 playbackHolder.appendChild(interfaceContext.playhead.object);
313 feedbackHolder.appendChild(playbackHolder); 313 feedbackHolder.appendChild(playbackHolder);
314 } 314 }
315 break; 315 } else if (interfaceObj[k].options[i].type == 'option' && interfaceObj[k].options[i].name == 'page-count')
316 {
317 var pagecountHolder = document.getElementById('page-count');
318 if (pagecountHolder == null)
319 {
320 pagecountHolder = document.createElement('div');
321 pagecountHolder.id = 'page-count';
322 }
323 pagecountHolder.innerHTML = '<span>Test '+(audioHolderObject.presentedId+1)+' of '+specification.audioHolders.length+'</span>';
324 var inject = document.getElementById('interface-buttons');
325 inject.appendChild(pagecountHolder);
316 } 326 }
317 } 327 }
318 } 328 }
319 // Setup question title 329 // Setup question title
320 330
432 442
433 document.getElementById('interface-buttons').appendChild(outsideReferenceHolder); 443 document.getElementById('interface-buttons').appendChild(outsideReferenceHolder);
434 } 444 }
435 445
436 446
437 testWaitIndicator(); 447 //testWaitIndicator();
438 } 448 }
439 449
440 function sliderObject(audioObject) { 450 function sliderObject(audioObject) {
441 // Create a new slider object; 451 // Create a new slider object;
442 this.parent = audioObject; 452 this.parent = audioObject;
443 this.trackSliderObj = document.createElement('div'); 453 this.trackSliderObj = document.createElement('div');
444 this.trackSliderObj.className = 'track-slider'; 454 this.trackSliderObj.className = 'track-slider track-slider-disabled';
445 this.trackSliderObj.id = 'track-slider-'+audioObject.id; 455 this.trackSliderObj.id = 'track-slider-'+audioObject.id;
446 456
447 this.trackSliderObj.setAttribute('trackIndex',audioObject.id); 457 this.trackSliderObj.setAttribute('trackIndex',audioObject.id);
448 this.trackSliderObj.innerHTML = '<span>'+audioObject.id+'</span>'; 458 this.trackSliderObj.innerHTML = '<span>'+audioObject.id+'</span>';
449 this.trackSliderObj.draggable = true; 459 this.trackSliderObj.draggable = true;
473 $('.comment-div').removeClass('comment-box-playing'); 483 $('.comment-div').removeClass('comment-box-playing');
474 $('#comment-div-'+id).addClass('comment-box-playing'); 484 $('#comment-div-'+id).addClass('comment-box-playing');
475 var outsideReference = document.getElementById('outside-reference'); 485 var outsideReference = document.getElementById('outside-reference');
476 if (outsideReference != undefined) 486 if (outsideReference != undefined)
477 $(outsideReference).removeClass('track-slider-playing'); 487 $(outsideReference).removeClass('track-slider-playing');
488 }
489 };
490
491 this.enable = function() {
492 if (this.parent.state == 1)
493 {
494 $(this.trackSliderObj).removeClass('track-slider-disabled');
478 } 495 }
479 }; 496 };
480 497
481 this.exportXMLDOM = function(audioObject) { 498 this.exportXMLDOM = function(audioObject) {
482 // Called by the audioObject holding this element. Must be present 499 // Called by the audioObject holding this element. Must be present
589 // MANDATORY FUNCTION 606 // MANDATORY FUNCTION
590 607
591 // Store the slider marker values 608 // Store the slider marker values
592 var holdValues = []; 609 var holdValues = [];
593 $(".track-slider").each(function(index,sliderObj){ 610 $(".track-slider").each(function(index,sliderObj){
594 holdValues.push(convSliderPosToRate(index)); 611 holdValues.push(convSliderPosToRate(sliderObj));
595 }); 612 });
596 613
597 var width = event.target.innerWidth; 614 var width = event.target.innerWidth;
598 var canvas = document.getElementById('sliderCanvasHolder'); 615 var canvas = document.getElementById('sliderCanvasHolder');
599 var sliderDiv = canvas.children[0]; 616 var sliderDiv = canvas.children[0];