Resolve merge conflicts

js/video_player.js

@@ -141,12 +141,17 @@ function format_time(t)
     hours = Math.floor(minutes / 60);
     seconds = seconds % 60;
     minutes = minutes % 60;
-    return hours+":"+((minutes < 10)?"0":"")+minutes+":"+((seconds < 10)?"0":"")+(seconds%60);
+
+    if (hours) {
+      return hours+":"+((minutes < 10)?"0":"")+minutes+":"+((seconds < 10)?"0":"")+(seconds%60);
+    } else {
+      return minutes+":"+((seconds < 10)?"0":"")+(seconds%60);
+    }
 }
 
 function update_captions(t) {
     var i=caption_index(t);
-    $("#vidtime").html(format_time(ytplayer.getCurrentTime())+'/'+format_time(ytplayer.getDuration()));
+    $("#vidtime").html(format_time(ytplayer.getCurrentTime())+' / '+format_time(ytplayer.getDuration()));
     var j;
     for(j=1; j<9; j++) {
 	$("#std_n"+j).html(caption_at(i-j));
@@ -198,7 +203,7 @@ function onYouTubePlayerAPIReady() {
     }
   });
   updateytplayerInfoInterval = setInterval(updateHTML5ytplayerInfo, 200);
-  ajax_videoInterval = setInterval(ajax_video, 5000);
+  //ajax_videoInterval = setInterval(ajax_video, 5000);
 }
 
 // Need this function to call the API ready callback when we switch to a tab with AJAX that has a video
@@ -209,9 +214,26 @@ function loadHTML5Video() {
     }
 }
 
+function isiOSDevice(){
+  var iphone = "iphone";
+  var ipod = "ipod";
+  var ipad = "ipad";
+  var uagent = navigator.userAgent.toLowerCase();
+
+  //alert(uagent);
+  if (uagent.search(ipad) > -1 || uagent.search(iphone) > -1
+      || uagent.search(ipod) > -1) {
+    return true;
+  }
+  return false;
+}
+
 function onPlayerReady(event) {
-  // alert("ready");
-  event.target.playVideo();
+  //do not want to autoplay on iOS devices since its not enabled
+  //and leads to confusing behavior for the user
+  if (!isiOSDevice()) {
+    event.target.playVideo();
+  }
 }
 
 function onPlayerStateChange(event) {