From bd769dc6f371f658a29f5ccd015f602ef07384eb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 5 Dec 2013 11:50:21 -0500 Subject: [PATCH] Removed unused properties from BaseItem. --- dashboard-ui/livetvtimer.html | 18 ++++++++++ dashboard-ui/scripts/librarybrowser.js | 2 +- dashboard-ui/scripts/livetvtimer.js | 43 ++++++++++++++++++++++- dashboard-ui/scripts/plugincatalogpage.js | 2 +- 4 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html index 0a7f8c2498..b4485886c3 100644 --- a/dashboard-ui/livetvtimer.html +++ b/dashboard-ui/livetvtimer.html @@ -12,6 +12,24 @@ Timers
+
+

+ +
    +
  • + + +
  • +
  • + + +
  • +
+
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 43bee79e90..2c5d41d095 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -597,7 +597,7 @@ } } - return item.IsFolder ? (id ? "itemList.html?parentId=" + id : "#") : "itemdetails.html?id=" + id; + return item.IsFolder ? (id ? "itemlist.html?parentId=" + id : "#") : "itemdetails.html?id=" + id; }, diff --git a/dashboard-ui/scripts/livetvtimer.js b/dashboard-ui/scripts/livetvtimer.js index 5f282702bb..49b223cd98 100644 --- a/dashboard-ui/scripts/livetvtimer.js +++ b/dashboard-ui/scripts/livetvtimer.js @@ -1 +1,42 @@ - \ No newline at end of file +(function ($, document, apiClient) { + + var currentItem; + + function renderTimer(page, item) { + + currentItem = item; + + $('.timerName', page).html(item.Name); + + Dashboard.hideLoadingMsg(); + } + + function reload(page) { + + Dashboard.showLoadingMsg(); + + var id = getParameterByName('id'); + + apiClient.getLiveTvTimer(id).done(function (result) { + + renderTimer(page, result); + + }); + } + + $(document).on('pageinit', "#liveTvTimerPage", function () { + + var page = this; + + }).on('pagebeforeshow', "#liveTvTimerPage", function () { + + var page = this; + + reload(page); + + }).on('pagehide', "#liveTvTimerPage", function () { + + currentItem = null; + }); + +})(jQuery, document, ApiClient); \ No newline at end of file diff --git a/dashboard-ui/scripts/plugincatalogpage.js b/dashboard-ui/scripts/plugincatalogpage.js index c097485494..5b01141cfb 100644 --- a/dashboard-ui/scripts/plugincatalogpage.js +++ b/dashboard-ui/scripts/plugincatalogpage.js @@ -76,7 +76,7 @@ currentCategory = category; } - var href = plugin.externalUrl ? plugin.externalUrl : "addPlugin.html?name=" + encodeURIComponent(plugin.name) + "&guid=" + plugin.guid; + var href = plugin.externalUrl ? plugin.externalUrl : "addplugin.html?name=" + encodeURIComponent(plugin.name) + "&guid=" + plugin.guid; var target = plugin.externalUrl ? ' target="_blank"' : ''; html += "
";