comparison interfaces/horizontal-sliders.js @ 1102:b5bf2f57187c

Merge
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Tue, 08 Mar 2016 14:44:14 +0000
parents 0a15fa67bda1
children 83b439322229
comparison
equal deleted inserted replaced
1101:a497058ae2ae 1102:b5bf2f57187c
148 if (pagecountHolder == null) 148 if (pagecountHolder == null)
149 { 149 {
150 pagecountHolder = document.createElement('div'); 150 pagecountHolder = document.createElement('div');
151 pagecountHolder.id = 'page-count'; 151 pagecountHolder.id = 'page-count';
152 } 152 }
153 pagecountHolder.innerHTML = '<span>Page '+(page.presentedId+1)+' of '+specification.pages.length+'</span>'; 153 pagecountHolder.innerHTML = '<span>Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+'</span>';
154 var inject = document.getElementById('interface-buttons'); 154 var inject = document.getElementById('interface-buttons');
155 inject.appendChild(pagecountHolder); 155 inject.appendChild(pagecountHolder);
156 break; 156 break;
157 case "volume": 157 case "volume":
158 if (document.getElementById('master-volume-holder') == null) 158 if (document.getElementById('master-volume-holder') == null)
208 // Distribute it randomnly 208 // Distribute it randomnly
209 sliderObj.slider.value = Math.random(); 209 sliderObj.slider.value = Math.random();
210 } 210 }
211 sliderBox.appendChild(sliderObj.holder); 211 sliderBox.appendChild(sliderObj.holder);
212 audioObject.bindInterface(sliderObj); 212 audioObject.bindInterface(sliderObj);
213 interfaceContext.createCommentBox(audioObject); 213 interfaceContext.commentBoxes.createCommentBox(audioObject);
214 label += 1; 214 label += 1;
215 } 215 }
216 216
217 }); 217 });
218 if (page.showElementComments) 218 if (page.showElementComments)
219 { 219 {
220 interfaceContext.showCommentBoxes(feedbackHolder,true); 220 interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder,true);
221 } 221 }
222 // Auto-align 222 // Auto-align
223 resizeWindow(null); 223 resizeWindow(null);
224 } 224 }
225 225
329 // Use storage.document.createElement('value'); to generate the XML node. 329 // Use storage.document.createElement('value'); to generate the XML node.
330 var node = storage.document.createElement('value'); 330 var node = storage.document.createElement('value');
331 node.textContent = this.slider.value; 331 node.textContent = this.slider.value;
332 return node; 332 return node;
333 }; 333 };
334 this.error = function() {
335 // audioObject has an error!!
336 this.playback.textContent = "Error";
337 $(this.playback).addClass("error-colour");
338 }
334 }; 339 };
335 340
336 function outsideReferenceDOM(audioObject,index,inject) 341 function outsideReferenceDOM(audioObject,index,inject)
337 { 342 {
338 this.parent = audioObject; 343 this.parent = audioObject;
392 }; 397 };
393 this.canMove = function() 398 this.canMove = function()
394 { 399 {
395 return false; 400 return false;
396 }; 401 };
402 this.error = function() {
403 // audioObject has an error!!
404 this.outsideReferenceHolder.textContent = "Error";
405 $(this.outsideReferenceHolder).addClass("error-colour");
406 }
397 } 407 }
398 408
399 function resizeWindow(event) 409 function resizeWindow(event)
400 { 410 {
401 // Called on every window resize event, use this to scale your page properly 411 // Called on every window resize event, use this to scale your page properly