From 4cdfe410b2d1d687ca056aaeaf79537bfd838dcb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 7 Jun 2013 13:29:33 -0400 Subject: [PATCH] cleanup helper functions --- dashboard-ui/scripts/Itemdetailpage.js | 4 +- dashboard-ui/scripts/dashboardpage.js | 44 +- dashboard-ui/scripts/librarybrowser.js | 6 +- dashboard-ui/scripts/mediaplayer.js | 6 +- dashboard-ui/scripts/playlist.js | 2 +- dashboard-ui/scripts/remotecontrol.js | 8 +- dashboard-ui/scripts/search.js | 2 +- dashboard-ui/scripts/site.js | 40 + dashboard-ui/scripts/videojsextensions.js | 978 ---------------------- 9 files changed, 56 insertions(+), 1034 deletions(-) delete mode 100644 dashboard-ui/scripts/videojsextensions.js diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js index 33184a93c..1afc3bcd5 100644 --- a/dashboard-ui/scripts/Itemdetailpage.js +++ b/dashboard-ui/scripts/Itemdetailpage.js @@ -595,7 +595,7 @@ html += '
' + chapterName + '
'; html += '
'; - html += ticks_to_human(chapter.StartPositionTicks); + html += Dashboard.getDisplayTime(chapter.StartPositionTicks); html += '
'; @@ -737,7 +737,7 @@ html += '
'; if (item.RunTimeTicks != "") { - html += ticks_to_human(item.RunTimeTicks); + html += Dashboard.getDisplayTime(item.RunTimeTicks); } else { html += " "; diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index 1710d09ce..263c95f88 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -206,9 +206,9 @@ html += "
"; if (item.RunTimeTicks) { - html += DashboardPage.getDisplayText(connection.NowPlayingPositionTicks || 0) + " / "; + html += Dashboard.getDisplayTime(connection.NowPlayingPositionTicks || 0) + " / "; - html += DashboardPage.getDisplayText(item.RunTimeTicks); + html += Dashboard.getDisplayTime(item.RunTimeTicks); } html += "
"; @@ -217,46 +217,6 @@ return html; }, - getDisplayText: function (ticks) { - - var ticksPerHour = 36000000000; - - var parts = []; - - var hours = ticks / ticksPerHour; - hours = parseInt(hours); - - if (hours) { - parts.push(hours); - } - - ticks -= (hours * ticksPerHour); - - var ticksPerMinute = 600000000; - - var minutes = ticks / ticksPerMinute; - minutes = parseInt(minutes); - - ticks -= (minutes * ticksPerMinute); - - if (minutes < 10 && hours) { - minutes = '0' + minutes; - } - parts.push(minutes); - - var ticksPerSecond = 10000000; - - var seconds = ticks / ticksPerSecond; - seconds = parseInt(seconds); - - if (seconds < 10) { - seconds = '0' + seconds; - } - parts.push(seconds); - - return parts.join(':'); - }, - renderRunningTasks: function (dashboardInfo) { var page = $.mobile.activePage; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 43fd87be1..b1e1c2fe7 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -278,7 +278,7 @@ } } - var time = DashboardPage.getDisplayText(item.RunTimeTicks || 0); + var time = Dashboard.getDisplayTime(item.RunTimeTicks || 0); html += '' + time + ''; @@ -911,7 +911,7 @@ } else if (item.UserData && item.UserData.PlaybackPositionTicks && item.RunTimeTicks) { - tooltip = DashboardPage.getDisplayText(item.UserData.PlaybackPositionTicks) + " / " + DashboardPage.getDisplayText(item.RunTimeTicks); + tooltip = Dashboard.getDisplayTime(item.UserData.PlaybackPositionTicks) + " / " + Dashboard.getDisplayTime(item.RunTimeTicks); pct = (item.UserData.PlaybackPositionTicks / item.RunTimeTicks) * 100; } @@ -1365,7 +1365,7 @@ if (item.Type == "Audio") { - miscInfo.push(DashboardPage.getDisplayText(item.RunTimeTicks)); + miscInfo.push(Dashboard.getDisplayTime(item.RunTimeTicks)); } else { var minutes = item.RunTimeTicks / 600000000; diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 04224f584..248c7fd9f 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -295,11 +295,11 @@ // Convert to ticks ticks = Math.floor(ticks); - var timeText = DashboardPage.getDisplayText(ticks); + var timeText = Dashboard.getDisplayTime(ticks); if (curentDurationTicks) { - timeText += " / " + DashboardPage.getDisplayText(curentDurationTicks); + timeText += " / " + Dashboard.getDisplayTime(curentDurationTicks); if (updateSlider) { var percent = ticks / curentDurationTicks; @@ -1116,7 +1116,7 @@ var name = chapter.Name || "Chapter " + (i + 1); html += '
' + name + '
'; - html += '
' + DashboardPage.getDisplayText(chapter.StartPositionTicks) + '
'; + html += '
' + Dashboard.getDisplayTime(chapter.StartPositionTicks) + '
'; html += '
'; diff --git a/dashboard-ui/scripts/playlist.js b/dashboard-ui/scripts/playlist.js index cd299b8be..1a7380108 100644 --- a/dashboard-ui/scripts/playlist.js +++ b/dashboard-ui/scripts/playlist.js @@ -24,7 +24,7 @@ html += ''; html += '' + name + ''; html += '' + parentName + ''; - html += '' + ticks_to_human(item.RunTimeTicks) + ''; + html += '' + Dashboard.getDisplayTime(item.RunTimeTicks) + ''; html += '' + LibraryBrowser.getUserDataIconsHtml(item) + ''; html += ''; html += ''; diff --git a/dashboard-ui/scripts/remotecontrol.js b/dashboard-ui/scripts/remotecontrol.js index ec75b0a54..7895159dd 100644 --- a/dashboard-ui/scripts/remotecontrol.js +++ b/dashboard-ui/scripts/remotecontrol.js @@ -375,7 +375,7 @@ html += ''; - html += '' + name + '
' + DashboardPage.getDisplayText(chapter.StartPositionTicks) + ''; + html += '' + name + '
' + Dashboard.getDisplayTime(chapter.StartPositionTicks) + ''; html += ''; } @@ -524,12 +524,12 @@ if (session.NowPlayingItem) { - html += DashboardPage.getDisplayText(session.NowPlayingPositionTicks || 0); + html += Dashboard.getDisplayTime(session.NowPlayingPositionTicks || 0); if (session.NowPlayingItem.RunTimeTicks) { html += " / "; - html += DashboardPage.getDisplayText(session.NowPlayingItem.RunTimeTicks); + html += Dashboard.getDisplayTime(session.NowPlayingItem.RunTimeTicks); } } @@ -592,7 +592,7 @@ html += '' + video.Name; if (video.RunTimeTicks) { - html += '
' + DashboardPage.getDisplayText(video.RunTimeTicks); + html += '
' + Dashboard.getDisplayTime(video.RunTimeTicks); } html += ''; diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js index ca8d58941..fc09baa08 100644 --- a/dashboard-ui/scripts/search.js +++ b/dashboard-ui/scripts/search.js @@ -197,7 +197,7 @@ } else if (hint.RunTimeTicks) { - html += '
' + DashboardPage.getDisplayText(hint.RunTimeTicks) + '
'; + html += '
' + Dashboard.getDisplayTime(hint.RunTimeTicks) + '
'; } html += ''; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 28750dfb2..4ce864371 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1100,6 +1100,46 @@ var Dashboard = { if (title) { document.title = title; } + }, + + getDisplayTime: function (ticks) { + + var ticksPerHour = 36000000000; + + var parts = []; + + var hours = ticks / ticksPerHour; + hours = parseInt(hours); + + if (hours) { + parts.push(hours); + } + + ticks -= (hours * ticksPerHour); + + var ticksPerMinute = 600000000; + + var minutes = ticks / ticksPerMinute; + minutes = parseInt(minutes); + + ticks -= (minutes * ticksPerMinute); + + if (minutes < 10 && hours) { + minutes = '0' + minutes; + } + parts.push(minutes); + + var ticksPerSecond = 10000000; + + var seconds = ticks / ticksPerSecond; + seconds = parseInt(seconds); + + if (seconds < 10) { + seconds = '0' + seconds; + } + parts.push(seconds); + + return parts.join(':'); } diff --git a/dashboard-ui/scripts/videojsextensions.js b/dashboard-ui/scripts/videojsextensions.js deleted file mode 100644 index a60c72b14..000000000 --- a/dashboard-ui/scripts/videojsextensions.js +++ /dev/null @@ -1,978 +0,0 @@ -//parse video player src URL -function parse_src_url(url) { - var src = url.replace("\?", "\&"); - var parts = src.split("/"); - var len = parts.length - 1; - var query = parts[len].split("&"); - var array = new Array(); - - array['Type'] = parts[len - 2]; - array['item_id'] = parts[len - 1]; - - for (var i = 0; i < query.length; i++) { - var pairs; - if (i == 0) { - pairs = query[i].split("."); - } else { - pairs = query[i].split("="); - } - - array[pairs[0]] = pairs[1]; - } - - return array; -} - -var videoJSextension = { - - /* - Add our video quality selector button to the videojs controls. This takes - a mandatory jQuery object of the