From b60443ec9b14b81c47fd1520e12d0d6647b127f2 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 18 Apr 2016 13:40:48 -0400
Subject: [PATCH 1/5] fix directory picker

---
 dashboard-ui/scripts/dashboardgeneral.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/dashboard-ui/scripts/dashboardgeneral.js b/dashboard-ui/scripts/dashboardgeneral.js
index 5681cfa87d..847dbe9050 100644
--- a/dashboard-ui/scripts/dashboardgeneral.js
+++ b/dashboard-ui/scripts/dashboardgeneral.js
@@ -146,6 +146,25 @@
             });
         });
 
+        $('#btnSelectDashboardSourcePath', view).on("click.selectDirectory", function () {
+
+            require(['directorybrowser'], function (directoryBrowser) {
+
+                var picker = new directoryBrowser();
+
+                picker.show({
+
+                    callback: function (path) {
+
+                        if (path) {
+                            view.querySelector('#txtDashboardSourcePath').value = path;
+                        }
+                        picker.close();
+                    }
+                });
+            });
+        });
+
         $('.dashboardGeneralForm', view).off('submit', onSubmit).on('submit', onSubmit);
 
         view.addEventListener('viewshow', function () {

From 94b6bfdfa0fbd7bf40132d278574e77ec86fb41c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 18 Apr 2016 16:09:07 -0400
Subject: [PATCH 2/5] fix safari resume

---
 dashboard-ui/scripts/htmlmediarenderer.js | 27 +++--------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js
index 86b3d0528c..f651374f51 100644
--- a/dashboard-ui/scripts/htmlmediarenderer.js
+++ b/dashboard-ui/scripts/htmlmediarenderer.js
@@ -103,25 +103,6 @@
             });
         }
 
-        function getStartTime(url) {
-
-            var src = url;
-
-            var parts = src.split('#');
-
-            if (parts.length > 1) {
-
-                parts = parts[parts.length - 1].split('=');
-
-                if (parts.length == 2) {
-
-                    return parseFloat(parts[1]);
-                }
-            }
-
-            return 0;
-        }
-
         function onOneVideoPlaying(e) {
 
             var element = e.target;
@@ -136,12 +117,11 @@
             }
 
             if (requiresSettingStartTimeOnStart) {
-                var src = (self.currentSrc() || '').toLowerCase();
 
-                var startPositionInSeekParam = getStartTime(src);
+                var startPositionInSeekParam = currentPlayOptions.startPositionInSeekParam;
 
                 // Appending #t=xxx to the query string doesn't seem to work with HLS
-                if (startPositionInSeekParam && src.indexOf('.m3u8') != -1) {
+                if (startPositionInSeekParam && currentSrc.indexOf('.m3u8') != -1) {
 
                     var delay = browserInfo.safari ? 2500 : 0;
                     if (delay) {
@@ -352,7 +332,6 @@
 
                 return;
             }
-
             elem.crossOrigin = getCrossOriginValue(mediaSource);
             var val = streamInfo.url;
 
@@ -361,7 +340,7 @@
             }
 
             requiresSettingStartTimeOnStart = false;
-            var startTime = getStartTime(val);
+            var startTime = streamInfo.startPositionInSeekParam;
             var playNow = false;
 
             if (elem.tagName.toLowerCase() == 'audio') {

From 03c57fdb6a816547d90425c9f82c516b0eaaae29 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 18 Apr 2016 13:43:00 -0400
Subject: [PATCH 3/5] update NAL usage

---
 dashboard-ui/scripts/itemdetailpage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 403397350a..c65220fb2f 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -1539,8 +1539,8 @@
                 attributes.push(createAttribute(Globalize.translate('MediaInfoRefFrames'), stream.RefFrames));
             }
 
-            if (stream.KeyFrames) {
-                //attributes.push(createAttribute(Globalize.translate('MediaInfoKeyFrames'), stream.KeyFrames.join(', ')));
+            if (stream.NalLengthSize) {
+                attributes.push(createAttribute('NAL', stream.NalLengthSize));
             }
 
             if (stream.Type != "Video") {

From af5c8c8b23cec47720e8330922ae8eaae2e995b6 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 18 Apr 2016 22:07:23 -0400
Subject: [PATCH 4/5] update reset pin code

---
 dashboard-ui/userpassword.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard-ui/userpassword.html b/dashboard-ui/userpassword.html
index 625a022e3d..d370c4ff2c 100644
--- a/dashboard-ui/userpassword.html
+++ b/dashboard-ui/userpassword.html
@@ -66,7 +66,7 @@
                                 <button type="submit" data-role="none" class="clearButton">
                                     <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
                                 </button>
-                                <paper-button id="btnResetEasyPassword" style="display:none;" raised class="cancel block" onclick="UpdatePasswordPage.resetEasyPassword();"><iron-icon icon="lock"></iron-icon><span>${ButtonResetEasyPassword}</span></paper-button>
+                                <paper-button id="btnResetEasyPassword" raised class="cancel block hide" onclick="UpdatePasswordPage.resetEasyPassword();"><iron-icon icon="lock"></iron-icon><span>${ButtonResetEasyPassword}</span></paper-button>
                             </div>
                         </div>
                     </div>

From 896957e8560fa16b90bc9d38526416ccb76e8b2e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 19 Apr 2016 22:58:36 -0400
Subject: [PATCH 5/5] fix report icons

---
 dashboard-ui/scripts/reports.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dashboard-ui/scripts/reports.js b/dashboard-ui/scripts/reports.js
index 57fd58bf8b..3e00bba141 100644
--- a/dashboard-ui/scripts/reports.js
+++ b/dashboard-ui/scripts/reports.js
@@ -169,11 +169,11 @@
                 break;
             case "StatusImage":
                 if (rRow.HasLockData) {
-                    html += '<img src="css/images/editor/lock.png"  style="width:18px"/>';
+                    html += '<iron-icon icon="lock" style="height:18px"></iron-icon>';
                 }
 
                 if (!rRow.HasLocalTrailer && rRow.RowType === "Movie") {
-                    html += '<img src="css/images/editor/missingtrailer.png" title="Missing local trailer."  style="width:18px"/>';
+                    html += '<iron-icon icon="videocam" title="Missing local trailer." style="height:18px"></iron-icon>';
                 }
 
                 if (!rRow.HasImageTagsPrimary) {