From d0afade8ed26276023d02ea9f394b5f5bcd688fe Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 7 Mar 2016 13:50:58 -0500
Subject: [PATCH] update hls subtitles

---
 dashboard-ui/bower_components/iron-behaviors/.bower.json | 6 +++---
 .../bower_components/paper-behaviors/.bower.json         | 4 ++--
 dashboard-ui/bower_components/paper-ripple/.bower.json   | 6 +++---
 dashboard-ui/scripts/htmlmediarenderer.js                | 9 ++++++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/dashboard-ui/bower_components/iron-behaviors/.bower.json b/dashboard-ui/bower_components/iron-behaviors/.bower.json
index 0b0736d6a6..85e8252b32 100644
--- a/dashboard-ui/bower_components/iron-behaviors/.bower.json
+++ b/dashboard-ui/bower_components/iron-behaviors/.bower.json
@@ -29,14 +29,14 @@
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
   "ignore": [],
-  "homepage": "https://github.com/polymerelements/iron-behaviors",
+  "homepage": "https://github.com/PolymerElements/iron-behaviors",
   "_release": "1.0.13",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.13",
     "commit": "a7bc3428a6da2beed21987b3a8028206826a12bc"
   },
-  "_source": "git://github.com/polymerelements/iron-behaviors.git",
+  "_source": "git://github.com/PolymerElements/iron-behaviors.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-behaviors"
+  "_originalSource": "PolymerElements/iron-behaviors"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json
index a6b333d335..2b04bf9f8a 100644
--- a/dashboard-ui/bower_components/paper-behaviors/.bower.json
+++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json
@@ -45,7 +45,7 @@
     "tag": "v1.0.11",
     "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
   },
-  "_source": "git://github.com/polymerelements/paper-behaviors.git",
+  "_source": "git://github.com/PolymerElements/paper-behaviors.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/paper-behaviors"
+  "_originalSource": "PolymerElements/paper-behaviors"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json
index 2f654d71c6..157225ee71 100644
--- a/dashboard-ui/bower_components/paper-ripple/.bower.json
+++ b/dashboard-ui/bower_components/paper-ripple/.bower.json
@@ -32,14 +32,14 @@
     "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
   },
   "ignore": [],
-  "homepage": "https://github.com/polymerelements/paper-ripple",
+  "homepage": "https://github.com/PolymerElements/paper-ripple",
   "_release": "1.0.5",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.5",
     "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
   },
-  "_source": "git://github.com/polymerelements/paper-ripple.git",
+  "_source": "git://github.com/PolymerElements/paper-ripple.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/paper-ripple"
+  "_originalSource": "PolymerElements/paper-ripple"
 }
\ No newline at end of file
diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js
index 520b447261..0052289002 100644
--- a/dashboard-ui/scripts/htmlmediarenderer.js
+++ b/dashboard-ui/scripts/htmlmediarenderer.js
@@ -513,7 +513,10 @@
         function enableNativeTrackSupport(track) {
 
             if (browserInfo.safari) {
-                return false;
+                if (navigator.userAgent.toLowerCase().indexOf('os x') == -1) {
+                    // Leave it to apple to have different behavior between safari on ios vs osx
+                    return false;
+                }
             }
 
             if (browserInfo.firefox) {
@@ -594,13 +597,13 @@
                 trackElement.label = 'manualTrack' + track.index;
 
                 // download the track json
-                fetchSubtitles(track).then(function(data) {
+                fetchSubtitles(track).then(function (data) {
 
                     // show in ui
                     console.log('downloaded ' + data.TrackEvents.length + ' track events');
                     // add some cues to show the text
                     // in safari, the cues need to be added before setting the track mode to showing
-                    data.TrackEvents.forEach(function(trackEvent) {
+                    data.TrackEvents.forEach(function (trackEvent) {
                         trackElement.addCue(new VTTCue(trackEvent.StartPositionTicks / 10000000, trackEvent.EndPositionTicks / 10000000, trackEvent.Text.replace(/\\N/gi, '\n')));
                     });
                     trackElement.mode = 'showing';