fix merge conflict

dashboard-ui/scripts/htmlmediarenderer.js

@@ -3,6 +3,7 @@
     var supportsTextTracks;
     var hlsPlayer;
     var requiresSettingStartTimeOnStart;
+    var subtitleTrackIndexToSetOnPlaying;
 
     function htmlMediaRenderer(options) {
 
@@ -134,6 +135,8 @@
             var element = e.target;
             element.removeEventListener('playing', onOneVideoPlaying);
 
+            self.setCurrentTrackElement(subtitleTrackIndexToSetOnPlaying);
+
             var requiresNativeControls = !self.enableCustomVideoControls();
 
             if (requiresNativeControls) {
@@ -384,6 +387,15 @@
 
                 tracks = tracks || [];
 
+                var currentTrackIndex = -1;
+                for (var i = 0, length = tracks.length; i < length; i++) {
+                    if (tracks[i].isDefault) {
+                        currentTrackIndex = i;
+                        break;
+                    }
+                }
+                subtitleTrackIndexToSetOnPlaying = currentTrackIndex;
+
                 if (enableHlsPlayer(val)) {
 
                     setTracks(elem, tracks);
@@ -407,14 +419,6 @@
                     playNow = true;
                 }
 
-                var currentTrackIndex = -1;
-                for (var i = 0, length = tracks.length; i < length; i++) {
-                    if (tracks[i].isDefault) {
-                        currentTrackIndex = i;
-                        break;
-                    }
-                }
-
                 self.setCurrentTrackElement(currentTrackIndex);
             }
 

dashboard-ui/scripts/site.js

@@ -1759,6 +1759,11 @@ var AppInfo = {};
             require(['themes/halloween/theme']);
             return;
         }
+
+        if (month == 11 && day >= 18 && day <= 26) {
+            //require(['themes/holiday/theme']);
+            return;
+        }
     }
 
     function initRequire() {