Merge pull request #92 from capilkey/fix-playback-merge

fixed my botched playback merge from 3 months ago

record-and-playback/presentation/playback/presentation/acornmediaplayer/jquery.acornmediaplayer.js

@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD
- * Acorn Media Player - jQuery plugin 1.5
-=======
  * Acorn Media Player - jQuery plugin 1.6
->>>>>>> origin/master
  *
  * Copyright (C) 2012 Ionut Cristian Colceriu
  *
@@ -49,13 +45,10 @@
 			}
 		}
 		
-<<<<<<< HEAD
-=======
 		/* Detect Touch support
 		 */
 		var is_touch_device = 'ontouchstart' in document.documentElement;
 		
->>>>>>> origin/master
 		/*
 		 * Get the volume value from localStorage
 		 * If no value is present, define as maximum
@@ -152,10 +145,6 @@
 			/*
 			 * Append the HTML markup
 			 */
-<<<<<<< HEAD
-			acorn.$self.wrap($wrapper).after(template).after('<div class="loading-media"></div>');
-		
-=======
 			
 			// append the wrapper
 			acorn.$self.after($wrapper);
@@ -171,7 +160,6 @@
 			// append the controls and loading mask
 			acorn.$self.after(template).after('<div class="loading-media"></div>');
 			
->>>>>>> origin/master
 			/*
 			 * Define the newly created DOM nodes
 			 */
@@ -227,12 +215,8 @@
 				if(!acorn.$self.prop('paused')) {
 					acorn.$self.trigger('pause');
 				} else {
-<<<<<<< HEAD
-					acorn.$self.trigger('play');
-=======
 					//acorn.$self.trigger('play');
 					acorn.$self[0].play();
->>>>>>> origin/master
 				}
 			};
 			
@@ -627,12 +611,6 @@
 				} else {						
 					if(acorn.$self[0].webkitSupportsFullscreen) {
 						acorn.$self[0].webkitEnterFullScreen();
-<<<<<<< HEAD
-					} else {
-						$('body').css('overflow', 'hidden');							
-					
-						acorn.$self.addClass('fullscreen-video').attr({							
-=======
 					} else if (acorn.$self[0].mozRequestFullScreen) {
 						acorn.$self[0].mozRequestFullScreen();
 						acorn.$self.attr('controls', 'controls');
@@ -647,7 +625,6 @@
 						$('body').css('overflow', 'hidden');
 					
 						acorn.$self.addClass('fullscreen-video').attr({
->>>>>>> origin/master
 							width: $(window).width(),
 							height: $(window).height()
 						});
@@ -918,17 +895,10 @@
 			 * Runs other initialization functions, attaches events, removes native controls
 			 */
 			var init = function() {
-<<<<<<< HEAD
-				// attach playback handlers				
-				acorn.$playBtn.click(playMedia);
-				acorn.$self.click(playMedia);
-				
-=======
 				// attach playback handlers
 				acorn.$playBtn.bind( (is_touch_device) ? 'touchstart' : 'click', playMedia);
 				acorn.$self.bind( (is_touch_device) ? 'touchstart' : 'click' , playMedia);
 
->>>>>>> origin/master
 				acorn.$self.bind('play', startPlayback);
 				acorn.$self.bind('pause', stopPlayback);
 				acorn.$self.bind('ended', stopPlayback);
@@ -948,19 +918,12 @@
 				if(!options.nativeSliders) initSeek();
 				
 				// once the metadata has loaded
-<<<<<<< HEAD
-				acorn.$self.bind('loadedmetadata', function() {					
-=======
 				acorn.$self.bind('loadedmetadata', function() {
->>>>>>> origin/master
 					/* I use an interval to make sure the video has the right readyState
 					 * to bypass a known webkit bug that causes loadedmetadata to be triggered
 					 * before the duration is available
 					 */
-<<<<<<< HEAD
-=======
-					 
->>>>>>> origin/master
+
 					var t = window.setInterval(function() {
 								if (acorn.$self[0].readyState > 0) {									
 									updateSeek();
@@ -970,16 +933,11 @@
 							}, 500);
 					
 					initCaption();					
-<<<<<<< HEAD
-				});				
-								
-=======
 				});
 			
 				// trigger update seek manualy for the first time, for iOS support
 				updateSeek();
 				
->>>>>>> origin/master
 				// remove the native controls
 				acorn.$self.removeAttr('controls');
 				
@@ -991,10 +949,6 @@
 					 */
 					acorn.$container.addClass('audio-player');
 				}
-<<<<<<< HEAD
-=======
-				
->>>>>>> origin/master
 			}();
 		
 		};
@@ -1066,8 +1020,4 @@ function parseSrt(data) {
     }
 
     return captions;
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> origin/master

record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/acorn.darkglass.css

@@ -19,26 +19,8 @@
 .acorn-player.darkglass {
 	float: left;
 	position: relative;	
-	
 	padding: 2px;
-<<<<<<< HEAD
-	border: 2px solid #61625d;
-
 	font-family: Arial, Helvetica, sans-serif;
-		
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-	
-	background: #000000;
-	background-image: -moz-linear-gradient(top, #313131, #000000);
-	background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #313131),color-stop(1, #000000));	
-=======
-
-	font-family: Arial, Helvetica, sans-serif;
-	
-	
->>>>>>> origin/master
 }
 /* <video> element */
 .acorn-player.darkglass video {
@@ -60,20 +42,15 @@
 	float: left;
 	clear: both;
 	width: 95%;
-<<<<<<< HEAD
-	padding-right: 5%;	
-=======
 	padding-right: 5%;
 	padding-left: 1%;
 	border: 2px solid #61625d;	
 	-moz-border-radius: 5px;
 	-webkit-border-radius: 5px;
 	border-radius: 5px;
-	
 	background: #000000;
 	background-image: -moz-linear-gradient(top, #313131, #000000);
 	background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #313131),color-stop(1, #000000));		
->>>>>>> origin/master
 }
 /* <button>s */
 .acorn-player.darkglass button {
@@ -124,12 +101,7 @@
 	width: 72%;
 	height: 10px;
 	margin: 5px 1% 0px 1%;
-<<<<<<< HEAD
-	background: #535353;
-
-=======
 	background: #7289A8;
->>>>>>> origin/master
 	-moz-border-radius: 15px;
 	-webkit-border-radius: 15px;
 	border-radius: 15px;	
@@ -148,22 +120,14 @@
 	border-radius: 10px;
 }
 .acorn-player.darkglass .acorn-seek-slider .ui-slider-range {		
-<<<<<<< HEAD
-	background: #4cbae8;
-=======
 	background: #0750B2;
->>>>>>> origin/master
 	
 	-moz-border-radius:10px;
 	-webkit-border-radius:10px;
 	border-radius:10px;
 }
 .acorn-player.darkglass .acorn-buffer {
-<<<<<<< HEAD
-	background: #40338e !important;
-=======
 	background: #8E9DAF !important;
->>>>>>> origin/master
 }
 .acorn-player.darkglass .acorn-seek-slider .ui-state-focus, .acorn-player.darkglass .acorn-seek-slider .ui-slider-handle.ui-state-hover {
 	background: #fff !important;
@@ -378,8 +342,4 @@
 	width: 91%;
 	
 	border: none;
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> origin/master

record-and-playback/presentation/playback/presentation/css/bbb.playback.css

@@ -194,11 +194,7 @@ br{
         color: #666;
         text-align: center;
         clear: both;
-<<<<<<< HEAD
-	padding-top: 25px;
-=======
 	padding-top: 35px;
->>>>>>> origin/master
 }
 
 .circle {

record-and-playback/presentation/playback/presentation/playback.html

@@ -64,7 +64,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		  	<div id="audioRecordingWrapper" role="region" aria-label="Audio">
 <!--
 		  	  <audio id="video">You must use an HTML5 capable browser to view this page.
->>>>>>> origin/master
 			  This playback requires modern browser, please use FF, Safari, Chrome</audio>	
 -->
 		  	</div>