Mercurial > hg > webaudioevaluationtool
comparison ape.js @ 785:c8f99418b34b
Bug #1490: Popup button 'enter' key grab only bound once. APE Multi-interface has default metric response if only one axis used.
author | Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk> |
---|---|
date | Fri, 11 Dec 2015 11:42:28 +0000 |
parents | be470e2c4f77 |
children | 9ed3abe54604 |
comparison
equal
deleted
inserted
replaced
784:28a7016bffde | 785:c8f99418b34b |
---|---|
311 | 311 |
312 var node = interfaceContext.createCommentBox(audioObject); | 312 var node = interfaceContext.createCommentBox(audioObject); |
313 | 313 |
314 // Create a slider per track | 314 // Create a slider per track |
315 audioObject.interfaceDOM = new sliderObject(audioObject,interfaceObj); | 315 audioObject.interfaceDOM = new sliderObject(audioObject,interfaceObj); |
316 audioObject.metric.initialPosition = convSliderPosToRate(audioObject.interfaceDOM.trackSliderObjects[0]); | |
316 if (audioObject.state == 1) | 317 if (audioObject.state == 1) |
317 { | 318 { |
318 audioObject.interfaceDOM.enable(); | 319 audioObject.interfaceDOM.enable(); |
319 } | 320 } |
320 | 321 |
665 { | 666 { |
666 // MANDATORY | 667 // MANDATORY |
667 // Saves a specific test page | 668 // Saves a specific test page |
668 // You can use this space to add any extra nodes to your XML <audioHolder> saves | 669 // You can use this space to add any extra nodes to your XML <audioHolder> saves |
669 // Get the current <audioHolder> information in store (remember to appendChild your data to it) | 670 // Get the current <audioHolder> information in store (remember to appendChild your data to it) |
671 if (interfaceContext.interfaceSliders.length == 1) | |
672 { | |
673 // If there is only one axis, there only needs to be one metric return | |
674 return; | |
675 } | |
670 var audioelements = store.getElementsByTagName("audioelement"); | 676 var audioelements = store.getElementsByTagName("audioelement"); |
671 for (var i=0; i<audioelements.length; i++) | 677 for (var i=0; i<audioelements.length; i++) |
672 { | 678 { |
673 // Have to append the metric specific nodes | 679 // Have to append the metric specific nodes |
674 for (var k=0; k<interfaceContext.interfaceSliders.length; k++) | 680 if (testXML.outsideReference == null || testXML.outsideReference.id != audioelements[i].id) |
675 { | 681 { |
676 var node = interfaceContext.interfaceSliders[k].metrics[i].exportXMLDOM(); | 682 for (var k=0; k<interfaceContext.interfaceSliders.length; k++) |
677 node.setAttribute("interface-name",interfaceContext.interfaceSliders[k].name); | 683 { |
678 node.setAttribute("interfaceid",interfaceContext.interfaceSliders[k].id); | 684 var node = interfaceContext.interfaceSliders[k].metrics[i].exportXMLDOM(); |
679 audioelements[i].appendChild(node); | 685 node.setAttribute("interface-name",interfaceContext.interfaceSliders[k].name); |
680 } | 686 node.setAttribute("interfaceid",interfaceContext.interfaceSliders[k].id); |
681 } | 687 audioelements[i].appendChild(node); |
682 } | 688 } |
689 } | |
690 } | |
691 } |