diff ape.js @ 278:8020152a36af

Pull into main

--- a/ape.js	Mon Jul 20 12:47:16 2015 +0100
+++ b/ape.js	Fri Jul 24 18:59:39 2015 +0100
@@ -312,7 +312,17 @@
 					playbackHolder.appendChild(interfaceContext.playhead.object);
 					feedbackHolder.appendChild(playbackHolder);
 				}
-				break;
+			} else if (interfaceObj[k].options[i].type == 'option' && interfaceObj[k].options[i].name == 'page-count')
+			{
+				var pagecountHolder = document.getElementById('page-count');
+				if (pagecountHolder == null)
+				{
+					pagecountHolder = document.createElement('div');
+					pagecountHolder.id = 'page-count';
+				}
+				pagecountHolder.innerHTML = '<span>Test '+(audioHolderObject.presentedId+1)+' of '+specification.audioHolders.length+'</span>';
+				var inject = document.getElementById('interface-buttons');
+				inject.appendChild(pagecountHolder);
 			}
 		}
 	}
@@ -434,14 +444,14 @@
 	}
 	
 	
-	testWaitIndicator();
+	//testWaitIndicator();
 }
 
 function sliderObject(audioObject) {
 	// Create a new slider object;
 	this.parent = audioObject;
 	this.trackSliderObj = document.createElement('div');
-	this.trackSliderObj.className = 'track-slider';
+	this.trackSliderObj.className = 'track-slider track-slider-disabled';
 	this.trackSliderObj.id = 'track-slider-'+audioObject.id;
 
 	this.trackSliderObj.setAttribute('trackIndex',audioObject.id);
@@ -478,6 +488,13 @@
 		}
 	};
 	
+	this.enable = function() {
+		if (this.parent.state == 1)
+		{
+			$(this.trackSliderObj).removeClass('track-slider-disabled');
+		}
+	};
+	
 	this.exportXMLDOM = function(audioObject) {
 		// Called by the audioObject holding this element. Must be present
 		var node = document.createElement('value');
@@ -591,7 +608,7 @@
 	// Store the slider marker values
 	var holdValues = [];
 	$(".track-slider").each(function(index,sliderObj){
-		holdValues.push(convSliderPosToRate(index));
+		holdValues.push(convSliderPosToRate(sliderObj));
 	});
 	
 	var width = event.target.innerWidth;