diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 80786bb5a1..6446137332 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -1,4 +1,4 @@ -define(['layoutManager', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'userdataButtons', 'scrollStyles', 'emby-itemscontainer'], function (layoutManager, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, userdataButtons) { +define(['layoutManager', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'userdataButtons', 'dom', 'scrollStyles', 'emby-itemscontainer'], function (layoutManager, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, userdataButtons, dom) { var currentItem; @@ -2038,19 +2038,6 @@ window.ItemDetailPage = new itemDetailPage(); - function parentWithClass(elem, className) { - - while (!elem.classList || !elem.classList.contains(className)) { - elem = elem.parentNode; - - if (!elem) { - return null; - } - } - - return elem; - } - function onPlayClick() { playCurrentItem(this); } @@ -2144,20 +2131,20 @@ view.addEventListener('click', function (e) { - if (parentWithClass(e.target, 'moreScenes')) { + if (dom.parentWithClass(e.target, 'moreScenes')) { Dashboard.getCurrentUser().then(function (user) { renderScenes(view, currentItem, user); }); } - else if (parentWithClass(e.target, 'morePeople')) { + else if (dom.parentWithClass(e.target, 'morePeople')) { renderCast(view, currentItem, params.context); } - else if (parentWithClass(e.target, 'moreSpecials')) { + else if (dom.parentWithClass(e.target, 'moreSpecials')) { Dashboard.getCurrentUser().then(function (user) { renderSpecials(view, currentItem, user); }); } - else if (parentWithClass(e.target, 'moreCriticReviews')) { + else if (dom.parentWithClass(e.target, 'moreCriticReviews')) { renderCriticReviews(view, currentItem); } }); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index c755c8ed1d..6d7be81c1f 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1,17 +1,4 @@ -define(['scrollHelper', 'viewManager', 'appSettings', 'appStorage', 'apphost', 'datetime', 'itemHelper', 'mediaInfo', 'scroller', 'indicators', 'scrollStyles'], function (scrollHelper, viewManager, appSettings, appStorage, appHost, datetime, itemHelper, mediaInfo, scroller, indicators) { - - function parentWithClass(elem, className) { - - while (!elem.classList || !elem.classList.contains(className)) { - elem = elem.parentNode; - - if (!elem) { - return null; - } - } - - return elem; - } +define(['scrollHelper', 'viewManager', 'appSettings', 'appStorage', 'apphost', 'datetime', 'itemHelper', 'mediaInfo', 'scroller', 'indicators', 'dom', 'scrollStyles'], function (scrollHelper, viewManager, appSettings, appStorage, appHost, datetime, itemHelper, mediaInfo, scroller, indicators, dom) { function fadeInRight(elem) { @@ -267,7 +254,7 @@ tabs.addEventListener('click', function (e) { var current = tabs.querySelector('.is-active'); - var link = parentWithClass(e.target, 'pageTabButton'); + var link = dom.parentWithClass(e.target, 'pageTabButton'); if (link && link != current) { diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 25477198a0..10a8f228c6 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -179,7 +179,7 @@ function onHeaderAppsButtonClick() { - require(['dialogHelper'], function (dialogHelper) { + require(['dialogHelper', 'dom'], function (dialogHelper, dom) { var dlg = dialogHelper.createDialog({ removeOnClose: true, @@ -222,7 +222,7 @@ document.body.appendChild(dlg); dlg.addEventListener('click', function (e) { - var link = parentWithTag(e.target, 'A'); + var link = dom.parentWithTag(e.target, 'A'); if (link) { dialogHelper.close(dlg); } @@ -391,19 +391,6 @@ } } - function parentWithTag(elem, tagName) { - - while (elem.tagName != tagName) { - elem = elem.parentNode; - - if (!elem) { - return null; - } - } - - return elem; - } - function updateDashboardMenuSelectedItem() { var links = navDrawerScrollContainer.querySelectorAll('.sidebarLink'); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index b439ca4613..8e63febafb 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1822,6 +1822,7 @@ var AppInfo = {}; define("subtitleEditor", [embyWebComponentsBowerPath + "/subtitleeditor/subtitleeditor"], returnFirstDependency); define("mediaInfo", [embyWebComponentsBowerPath + "/mediainfo/mediainfo"], returnFirstDependency); define("itemContextMenu", [embyWebComponentsBowerPath + "/itemcontextmenu"], returnFirstDependency); + define("dom", [embyWebComponentsBowerPath + "/dom"], returnFirstDependency); define("playMenu", [embyWebComponentsBowerPath + "/playmenu"], returnFirstDependency); define("refreshDialog", [embyWebComponentsBowerPath + "/refreshdialog/refreshdialog"], returnFirstDependency); define("backdrop", [embyWebComponentsBowerPath + "/backdrop/backdrop"], returnFirstDependency);