# HG changeset patch # User Nicholas Jillings # Date 1458647532 0 # Node ID 501997c0f61f7682b3f1ae4d8ec7489e04ab2383 # Parent 5b902e1f737c6773db2894e83c74b435eec65a6f Outside Reference HTML now in core interfaceContext. diff -r 5b902e1f737c -r 501997c0f61f core.js --- a/core.js Tue Mar 22 11:31:51 2016 +0000 +++ b/core.js Tue Mar 22 11:52:12 2016 +0000 @@ -2841,6 +2841,74 @@ { this.commentQuestions = []; }; + + this.outsideReferenceDOM = function(audioObject,index,inject) + { + this.parent = audioObject; + this.outsideReferenceHolder = document.createElement('button'); + this.outsideReferenceHolder.id = 'outside-reference'; + this.outsideReferenceHolder.className = 'outside-reference'; + this.outsideReferenceHolder.setAttribute('track-id',index); + this.outsideReferenceHolder.textContent = "Play Reference"; + this.outsideReferenceHolder.disabled = true; + + this.outsideReferenceHolder.onclick = function(event) + { + audioEngineContext.play(event.currentTarget.getAttribute('track-id')); + }; + inject.appendChild(this.outsideReferenceHolder); + this.enable = function() + { + if (this.parent.state == 1) + { + this.outsideReferenceHolder.disabled = false; + } + }; + this.updateLoading = function(progress) + { + if (progress != 100) + { + progress = String(progress); + progress = progress.split('.')[0]; + this.outsideReferenceHolder.textContent = progress+'%'; + } else { + this.outsideReferenceHolder.textContent = "Play Reference"; + } + }; + this.startPlayback = function() + { + // Called when playback has begun + $('.track-slider').removeClass('track-slider-playing'); + $('.comment-div').removeClass('comment-box-playing'); + this.outsideReferenceHolder.style.backgroundColor = "#FDD"; + }; + this.stopPlayback = function() + { + // Called when playback has stopped. This gets called even if playback never started! + this.outsideReferenceHolder.style.backgroundColor = ""; + }; + this.exportXMLDOM = function(audioObject) + { + return null; + }; + this.getValue = function() + { + return 0; + }; + this.getPresentedId = function() + { + return 'Reference'; + }; + this.canMove = function() + { + return false; + }; + this.error = function() { + // audioObject has an error!! + this.outsideReferenceHolder.textContent = "Error"; + this.outsideReferenceHolder.style.backgroundColor = "#F00"; + } + } this.playhead = new function() { diff -r 5b902e1f737c -r 501997c0f61f interfaces/discrete.js --- a/interfaces/discrete.js Tue Mar 22 11:31:51 2016 +0000 +++ b/interfaces/discrete.js Tue Mar 22 11:52:12 2016 +0000 @@ -194,7 +194,7 @@ if (element.type == 'outside-reference') { // Construct outside reference; - var orNode = new outsideReferenceDOM(audioObject,index,document.getElementById('interface-buttons')); + var orNode = new interfaceContext.outsideReferenceDOM(audioObject,index,document.getElementById('interface-buttons')); audioObject.bindInterface(orNode); } else { // Create a slider per track @@ -399,79 +399,6 @@ } }; -function outsideReferenceDOM(audioObject,index,inject) -{ - this.parent = audioObject; - this.outsideReferenceHolder = document.createElement('button'); - this.outsideReferenceHolder.id = 'outside-reference'; - this.outsideReferenceHolder.className = 'outside-reference'; - this.outsideReferenceHolder.setAttribute('track-id',index); - this.outsideReferenceHolder.textContent = "Play Reference"; - this.outsideReferenceHolder.disabled = true; - - this.outsideReferenceHolder.onclick = function(event) - { - if (event.currentTarget.textContent == "Play Reference") { - audioEngineContext.play(event.currentTarget.getAttribute('track-id')); - } else { - audioEngineContext.stop(); - } - }; - inject.appendChild(this.outsideReferenceHolder); - this.enable = function() - { - if (this.parent.state == 1) - { - this.outsideReferenceHolder.disabled = false; - } - }; - this.updateLoading = function(progress) - { - if (progress != 100) - { - progress = String(progress); - progress = progress.split('.')[0]; - this.outsideReferenceHolder.textContent = progress+'%'; - } else { - this.outsideReferenceHolder.textContent = "Play Reference"; - } - }; - this.startPlayback = function() - { - // Called when playback has begun - this.outsideReferenceHolder.style.backgroundColor = "rgb(255,100,100)"; - this.outsideReferenceHolder.textContent = "Stop"; - }; - this.stopPlayback = function() - { - // Called when playback has stopped. This gets called even if playback never started! - $(this.outsideReferenceHolder).removeClass('track-slider-playing'); - this.outsideReferenceHolder.style.backgroundColor = ""; - this.outsideReferenceHolder.textContent = "Play Reference"; - }; - this.exportXMLDOM = function(audioObject) - { - return null; - }; - this.getValue = function() - { - return 0; - }; - this.getPresentedId = function() - { - return 'reference'; - }; - this.canMove = function() - { - return false; - }; - this.error = function() { - // audioObject has an error!! - this.outsideReferenceHolder.textContent = "Error"; - $(this.outsideReferenceHolder).addClass("error-colour"); - } -} - function resizeWindow(event) { // Called on every window resize event, use this to scale your page properly diff -r 5b902e1f737c -r 501997c0f61f interfaces/horizontal-sliders.js --- a/interfaces/horizontal-sliders.js Tue Mar 22 11:31:51 2016 +0000 +++ b/interfaces/horizontal-sliders.js Tue Mar 22 11:52:12 2016 +0000 @@ -194,7 +194,7 @@ if (element.type == 'outside-reference') { // Construct outside reference; - var orNode = new outsideReferenceDOM(audioObject,index,document.getElementById('interface-buttons')); + var orNode = new interfaceContext.outsideReferenceDOM(audioObject,index,document.getElementById('interface-buttons')); audioObject.bindInterface(orNode); } else { // Create a slider per track @@ -352,74 +352,6 @@ } }; -function outsideReferenceDOM(audioObject,index,inject) -{ - this.parent = audioObject; - this.outsideReferenceHolder = document.createElement('button'); - this.outsideReferenceHolder.id = 'outside-reference'; - this.outsideReferenceHolder.className = 'outside-reference'; - this.outsideReferenceHolder.setAttribute('track-id',index); - this.outsideReferenceHolder.textContent = "Play Reference"; - this.outsideReferenceHolder.disabled = true; - - this.outsideReferenceHolder.onclick = function(event) - { - audioEngineContext.play(event.currentTarget.getAttribute('track-id')); - }; - inject.appendChild(this.outsideReferenceHolder); - this.enable = function() - { - if (this.parent.state == 1) - { - this.outsideReferenceHolder.disabled = false; - } - }; - this.updateLoading = function(progress) - { - if (progress != 100) - { - progress = String(progress); - progress = progress.split('.')[0]; - this.outsideReferenceHolder[0].children[0].textContent = progress+'%'; - } else { - this.outsideReferenceHolder[0].children[0].textContent = "Play Reference"; - } - }; - this.startPlayback = function() - { - // Called when playback has begun - $('.track-slider').removeClass('track-slider-playing'); - $('.comment-div').removeClass('comment-box-playing'); - $(this.outsideReferenceHolder).addClass('track-slider-playing'); - }; - this.stopPlayback = function() - { - // Called when playback has stopped. This gets called even if playback never started! - $(this.outsideReferenceHolder).removeClass('track-slider-playing'); - }; - this.exportXMLDOM = function(audioObject) - { - return null; - }; - this.getValue = function() - { - return 0; - }; - this.getPresentedId = function() - { - return 'reference'; - }; - this.canMove = function() - { - return false; - }; - this.error = function() { - // audioObject has an error!! - this.outsideReferenceHolder.textContent = "Error"; - $(this.outsideReferenceHolder).addClass("error-colour"); - } -} - function resizeWindow(event) { // Called on every window resize event, use this to scale your page properly diff -r 5b902e1f737c -r 501997c0f61f interfaces/mushra.js --- a/interfaces/mushra.js Tue Mar 22 11:31:51 2016 +0000 +++ b/interfaces/mushra.js Tue Mar 22 11:52:12 2016 +0000 @@ -192,7 +192,7 @@ if (element.type == 'outside-reference') { // Construct outside reference; - var orNode = new outsideReferenceDOM(audioObject,index,document.getElementById('interface-buttons')); + var orNode = new interfaceContext.outsideReferenceDOM(audioObject,index,document.getElementById('interface-buttons')); audioObject.bindInterface(orNode); } else { // Create a slider per track @@ -364,74 +364,6 @@ } } -function outsideReferenceDOM(audioObject,index,inject) -{ - this.parent = audioObject; - this.outsideReferenceHolder = document.createElement('button'); - this.outsideReferenceHolder.id = 'outside-reference'; - this.outsideReferenceHolder.className = 'outside-reference'; - this.outsideReferenceHolder.setAttribute('track-id',index); - this.outsideReferenceHolder.textContent = "Play Reference"; - this.outsideReferenceHolder.disabled = true; - - this.outsideReferenceHolder.onclick = function(event) - { - audioEngineContext.play(event.currentTarget.getAttribute('track-id')); - }; - inject.appendChild(this.outsideReferenceHolder); - this.enable = function() - { - if (this.parent.state == 1) - { - this.outsideReferenceHolder.disabled = false; - } - }; - this.updateLoading = function(progress) - { - if (progress != 100) - { - progress = String(progress); - progress = progress.split('.')[0]; - this.outsideReferenceHolder[0].children[0].textContent = progress+'%'; - } else { - this.outsideReferenceHolder[0].children[0].textContent = "Play Reference"; - } - }; - this.startPlayback = function() - { - // Called when playback has begun - $('.track-slider').removeClass('track-slider-playing'); - $('.comment-div').removeClass('comment-box-playing'); - $(this.outsideReferenceHolder).addClass('track-slider-playing'); - }; - this.stopPlayback = function() - { - // Called when playback has stopped. This gets called even if playback never started! - $(this.outsideReferenceHolder).removeClass('track-slider-playing'); - }; - this.exportXMLDOM = function(audioObject) - { - return null; - }; - this.getValue = function() - { - return 0; - }; - this.getPresentedId = function() - { - return 'reference'; - }; - this.canMove = function() - { - return false; - }; - this.error = function() { - // audioObject has an error!! - this.outsideReferenceHolder.textContent = "Error"; - $(this.outsideReferenceHolder).addClass("error-colour"); - } -} - function resizeWindow(event) { // Function called when the window has been resized.