From 292a3bab2309af2a081c1d895fe3d3903cef9b61 Mon Sep 17 00:00:00 2001 From: softworkz Date: Sat, 19 Mar 2016 05:26:17 +0100 Subject: [PATCH] Introduced or adjusted 'define' pattern in script files for explicit declaration of jQuery dependency --- dashboard-ui/scripts/addpluginpage.js | 4 ++-- dashboard-ui/scripts/advancedconfigurationpage.js | 5 ++--- dashboard-ui/scripts/autoorganizelog.js | 4 ++-- dashboard-ui/scripts/autoorganizesmart.js | 4 ++-- dashboard-ui/scripts/autoorganizetv.js | 5 ++--- dashboard-ui/scripts/channelitems.js | 4 ++-- dashboard-ui/scripts/channels.js | 4 ++-- dashboard-ui/scripts/channelsettings.js | 4 ++-- dashboard-ui/scripts/channelslatest.js | 4 ++-- dashboard-ui/scripts/cinemamodeconfiguration.js | 4 ++-- dashboard-ui/scripts/connectlogin.js | 4 ++-- dashboard-ui/scripts/dashboardgeneral.js | 4 ++-- dashboard-ui/scripts/dashboardhosting.js | 4 ++-- dashboard-ui/scripts/device.js | 4 ++-- dashboard-ui/scripts/devices.js | 4 ++-- dashboard-ui/scripts/devicesupload.js | 4 ++-- dashboard-ui/scripts/dlnaprofile.js | 4 ++-- dashboard-ui/scripts/dlnaprofiles.js | 4 ++-- dashboard-ui/scripts/dlnaserversettings.js | 4 ++-- dashboard-ui/scripts/dlnasettings.js | 4 ++-- dashboard-ui/scripts/edititemmetadata.js | 2 +- dashboard-ui/scripts/encodingsettings.js | 4 ++-- dashboard-ui/scripts/episodes.js | 2 +- dashboard-ui/scripts/forgotpassword.js | 4 ++-- dashboard-ui/scripts/forgotpasswordpin.js | 4 ++-- dashboard-ui/scripts/gamegenrepage.js | 4 ++-- dashboard-ui/scripts/gamespage.js | 4 ++-- dashboard-ui/scripts/gamesrecommendedpage.js | 4 ++-- dashboard-ui/scripts/gamestudiospage.js | 4 ++-- dashboard-ui/scripts/gamesystemspage.js | 4 ++-- dashboard-ui/scripts/homenextup.js | 4 ++-- dashboard-ui/scripts/homeupcoming.js | 4 ++-- dashboard-ui/scripts/indexpage.js | 2 +- dashboard-ui/scripts/itembynamedetailpage.js | 4 ++-- dashboard-ui/scripts/itemdetailpage.js | 2 +- dashboard-ui/scripts/kids.js | 4 ++-- dashboard-ui/scripts/librarybrowser.js | 2 +- dashboard-ui/scripts/librarymenu.js | 2 +- dashboard-ui/scripts/librarypathmapping.js | 4 ++-- dashboard-ui/scripts/librarysettings.js | 4 ++-- dashboard-ui/scripts/livetvchannel.js | 4 ++-- dashboard-ui/scripts/livetvchannels.js | 4 ++-- dashboard-ui/scripts/livetvcomponents.js | 8 ++++---- dashboard-ui/scripts/livetvguide.js | 4 ++-- dashboard-ui/scripts/livetvguideprovider.js | 4 ++-- dashboard-ui/scripts/livetvitems.js | 4 ++-- dashboard-ui/scripts/livetvrecordinglist.js | 4 ++-- dashboard-ui/scripts/livetvrecordings.js | 4 ++-- dashboard-ui/scripts/livetvseriestimer.js | 4 ++-- dashboard-ui/scripts/livetvseriestimers.js | 4 ++-- dashboard-ui/scripts/livetvsettings.js | 4 ++-- dashboard-ui/scripts/livetvstatus.js | 4 ++-- dashboard-ui/scripts/livetvsuggested.js | 4 ++-- dashboard-ui/scripts/livetvtimer.js | 4 ++-- dashboard-ui/scripts/livetvtimers.js | 4 ++-- dashboard-ui/scripts/logpage.js | 4 ++-- dashboard-ui/scripts/medialibrarypage.js | 4 ++-- dashboard-ui/scripts/metadataadvanced.js | 4 ++-- dashboard-ui/scripts/metadataconfigurationpage.js | 4 ++-- dashboard-ui/scripts/metadataimagespage.js | 4 ++-- dashboard-ui/scripts/metadatanfo.js | 4 ++-- dashboard-ui/scripts/metadatasubtitles.js | 4 ++-- dashboard-ui/scripts/moviecollections.js | 4 ++-- dashboard-ui/scripts/moviegenres.js | 4 ++-- dashboard-ui/scripts/movies.js | 4 ++-- dashboard-ui/scripts/moviesrecommended.js | 4 ++-- dashboard-ui/scripts/moviestudios.js | 4 ++-- dashboard-ui/scripts/movietrailers.js | 4 ++-- dashboard-ui/scripts/musicalbumartists.js | 4 ++-- dashboard-ui/scripts/musicalbums.js | 4 ++-- dashboard-ui/scripts/musicartists.js | 4 ++-- dashboard-ui/scripts/musicfolders.js | 4 ++-- dashboard-ui/scripts/musicgenres.js | 4 ++-- dashboard-ui/scripts/musicrecommended.js | 4 ++-- dashboard-ui/scripts/mypreferencesdisplay.js | 2 +- dashboard-ui/scripts/mypreferenceshome.js | 4 ++-- dashboard-ui/scripts/mypreferenceslanguages.js | 2 +- dashboard-ui/scripts/myprofile.js | 8 ++++---- dashboard-ui/scripts/mysync.js | 4 ++-- dashboard-ui/scripts/mysyncsettings.js | 2 +- dashboard-ui/scripts/notificationsetting.js | 4 ++-- dashboard-ui/scripts/notificationsettings.js | 4 ++-- dashboard-ui/scripts/nowplayingpage.js | 4 ++-- dashboard-ui/scripts/photos.js | 4 ++-- dashboard-ui/scripts/playbackconfiguration.js | 4 ++-- dashboard-ui/scripts/playlists.js | 4 ++-- dashboard-ui/scripts/plugincatalogpage.js | 4 ++-- dashboard-ui/scripts/pluginspage.js | 4 ++-- dashboard-ui/scripts/remotecontrol.js | 4 ++-- dashboard-ui/scripts/reports.js | 8 ++++---- dashboard-ui/scripts/scheduledtaskspage.js | 4 ++-- dashboard-ui/scripts/searchpage.js | 4 ++-- dashboard-ui/scripts/sections.js | 2 +- dashboard-ui/scripts/selectserver.js | 4 ++-- dashboard-ui/scripts/serversecurity.js | 4 ++-- dashboard-ui/scripts/shared.js | 4 ++-- dashboard-ui/scripts/sharingmanager.js | 4 ++-- dashboard-ui/scripts/songs.js | 4 ++-- dashboard-ui/scripts/streamingsettings.js | 4 ++-- dashboard-ui/scripts/supporterkeypage.js | 2 +- dashboard-ui/scripts/syncactivity.js | 4 ++-- dashboard-ui/scripts/syncjob.js | 4 ++-- dashboard-ui/scripts/syncsettings.js | 4 ++-- dashboard-ui/scripts/tvgenres.js | 2 +- dashboard-ui/scripts/tvshows.js | 2 +- dashboard-ui/scripts/tvstudios.js | 2 +- dashboard-ui/scripts/useredit.js | 4 ++-- dashboard-ui/scripts/userlibraryaccess.js | 4 ++-- dashboard-ui/scripts/usernew.js | 4 ++-- dashboard-ui/scripts/userparentalcontrol.js | 4 ++-- dashboard-ui/scripts/userpassword.js | 4 ++-- dashboard-ui/scripts/userprofilespage.js | 4 ++-- dashboard-ui/scripts/wizardagreement.js | 4 ++-- dashboard-ui/scripts/wizardfinishpage.js | 4 ++-- dashboard-ui/scripts/wizardlivetvguide.js | 4 ++-- dashboard-ui/scripts/wizardlivetvtuner.js | 4 ++-- dashboard-ui/scripts/wizardservice.js | 4 ++-- dashboard-ui/scripts/wizardsettings.js | 4 ++-- dashboard-ui/scripts/wizardstartpage.js | 4 ++-- dashboard-ui/scripts/wizarduserpage.js | 4 ++-- 120 files changed, 232 insertions(+), 234 deletions(-) diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js index d835fe0807..4cf92541ee 100644 --- a/dashboard-ui/scripts/addpluginpage.js +++ b/dashboard-ui/scripts/addpluginpage.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function populateHistory(packageInfo, page) { @@ -320,4 +320,4 @@ window.AddPluginPage = new addPluginpage(); -})(jQuery, document, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/advancedconfigurationpage.js b/dashboard-ui/scripts/advancedconfigurationpage.js index 2784a0f5ae..8dfab18b78 100644 --- a/dashboard-ui/scripts/advancedconfigurationpage.js +++ b/dashboard-ui/scripts/advancedconfigurationpage.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config, systemInfo) { @@ -123,5 +123,4 @@ $('.advancedConfigurationForm').off('submit', onSubmit).on('submit', onSubmit); }); - -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js index 29b9d04963..8ee8773095 100644 --- a/dashboard-ui/scripts/autoorganizelog.js +++ b/dashboard-ui/scripts/autoorganizelog.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { var query = { @@ -335,4 +335,4 @@ Events.off(ApiClient, "websocketmessage", onWebSocketMessage); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/autoorganizesmart.js b/dashboard-ui/scripts/autoorganizesmart.js index 0ae31de4a5..d2f68c0c1a 100644 --- a/dashboard-ui/scripts/autoorganizesmart.js +++ b/dashboard-ui/scripts/autoorganizesmart.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { var query = { @@ -144,4 +144,4 @@ currentResult = null; }); -})(jQuery, document, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/autoorganizetv.js b/dashboard-ui/scripts/autoorganizetv.js index cc7aa9c405..1510130b74 100644 --- a/dashboard-ui/scripts/autoorganizetv.js +++ b/dashboard-ui/scripts/autoorganizetv.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function updateSeasonPatternHelp(page, value) { @@ -164,5 +164,4 @@ loadPage(page, config); }); }); - -})(jQuery, document, window); +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js index 88d09b500b..5bf7091f2f 100644 --- a/dashboard-ui/scripts/channelitems.js +++ b/dashboard-ui/scripts/channelitems.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; @@ -280,4 +280,4 @@ updateFilterControls(page); }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/channels.js b/dashboard-ui/scripts/channels.js index 7e506dfac5..c59bd56196 100644 --- a/dashboard-ui/scripts/channels.js +++ b/dashboard-ui/scripts/channels.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { // The base query options var query = { @@ -85,4 +85,4 @@ }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/channelsettings.js b/dashboard-ui/scripts/channelsettings.js index 7e39b235f6..b65c42d6e9 100644 --- a/dashboard-ui/scripts/channelsettings.js +++ b/dashboard-ui/scripts/channelsettings.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config) { @@ -45,4 +45,4 @@ }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/channelslatest.js b/dashboard-ui/scripts/channelslatest.js index ef4520580a..51004f33cb 100644 --- a/dashboard-ui/scripts/channelslatest.js +++ b/dashboard-ui/scripts/channelslatest.js @@ -1,4 +1,4 @@ -(function ($, document) { +define([], function () { function reloadItems(page) { @@ -34,4 +34,4 @@ }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/cinemamodeconfiguration.js b/dashboard-ui/scripts/cinemamodeconfiguration.js index 4277eab38d..3d2c0a305a 100644 --- a/dashboard-ui/scripts/cinemamodeconfiguration.js +++ b/dashboard-ui/scripts/cinemamodeconfiguration.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config) { @@ -120,4 +120,4 @@ } }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js index 8fcf93ddcc..f93f3d1064 100644 --- a/dashboard-ui/scripts/connectlogin.js +++ b/dashboard-ui/scripts/connectlogin.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { function login(page, username, password) { @@ -316,4 +316,4 @@ login(page, user, password); } -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/dashboardgeneral.js b/dashboard-ui/scripts/dashboardgeneral.js index 326f046187..093d220ee5 100644 --- a/dashboard-ui/scripts/dashboardgeneral.js +++ b/dashboard-ui/scripts/dashboardgeneral.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { var brandingConfigKey = "branding"; var currentBrandingOptions; @@ -132,4 +132,4 @@ }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/dashboardhosting.js b/dashboard-ui/scripts/dashboardhosting.js index 180535e1d6..d5eb583454 100644 --- a/dashboard-ui/scripts/dashboardhosting.js +++ b/dashboard-ui/scripts/dashboardhosting.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config) { @@ -83,4 +83,4 @@ $('.dashboardHostingForm').off('submit', onSubmit).on('submit', onSubmit); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/device.js b/dashboard-ui/scripts/device.js index eed304ca85..0d1a30d4b9 100644 --- a/dashboard-ui/scripts/device.js +++ b/dashboard-ui/scripts/device.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { function load(page, device, capabilities) { @@ -92,4 +92,4 @@ loadData(page); }); -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/devices.js b/dashboard-ui/scripts/devices.js index 8c8b8789c3..4d2e541b31 100644 --- a/dashboard-ui/scripts/devices.js +++ b/dashboard-ui/scripts/devices.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { function deleteDevice(page, id) { @@ -106,4 +106,4 @@ }); -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/devicesupload.js b/dashboard-ui/scripts/devicesupload.js index 6e91535c20..0688c93115 100644 --- a/dashboard-ui/scripts/devicesupload.js +++ b/dashboard-ui/scripts/devicesupload.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { function load(page, devices, config) { @@ -147,4 +147,4 @@ }); -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js index e47f8280da..3ff5c49f97 100644 --- a/dashboard-ui/scripts/dlnaprofile.js +++ b/dashboard-ui/scripts/dlnaprofile.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { var currentProfile; @@ -1174,4 +1174,4 @@ } }; -})(jQuery, document, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/dlnaprofiles.js b/dashboard-ui/scripts/dlnaprofiles.js index b552e22f2e..4c9e1eb7ad 100644 --- a/dashboard-ui/scripts/dlnaprofiles.js +++ b/dashboard-ui/scripts/dlnaprofiles.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadProfiles(page) { @@ -108,4 +108,4 @@ }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/dlnaserversettings.js b/dashboard-ui/scripts/dlnaserversettings.js index 4d8455b208..45147202be 100644 --- a/dashboard-ui/scripts/dlnaserversettings.js +++ b/dashboard-ui/scripts/dlnaserversettings.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config, users) { @@ -60,4 +60,4 @@ }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/dlnasettings.js b/dashboard-ui/scripts/dlnasettings.js index 2c16905cd2..f096c851e8 100644 --- a/dashboard-ui/scripts/dlnasettings.js +++ b/dashboard-ui/scripts/dlnasettings.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config) { @@ -48,4 +48,4 @@ }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 91d9c6033e..98f18a1cd8 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -1,4 +1,4 @@ -define(['historyManager'], function (historyManager) { +define(['historyManager', 'jQuery'], function (historyManager, $) { var currentItemId; diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js index a7ef820261..258224397b 100644 --- a/dashboard-ui/scripts/encodingsettings.js +++ b/dashboard-ui/scripts/encodingsettings.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config) { @@ -93,4 +93,4 @@ }); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index 681d91af37..9af648e49b 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -1,4 +1,4 @@ -define([], function () { +define(['jQuery'], function ($) { return function (view, params, tabContent) { diff --git a/dashboard-ui/scripts/forgotpassword.js b/dashboard-ui/scripts/forgotpassword.js index 9ea0fd62db..b61ad9e504 100644 --- a/dashboard-ui/scripts/forgotpassword.js +++ b/dashboard-ui/scripts/forgotpassword.js @@ -1,4 +1,4 @@ -(function (window) { +define(['jQuery'], function ($) { function processForgotPasswordResult(page, result) { @@ -68,4 +68,4 @@ $('.forgotPasswordForm', page).off('submit', onSubmit).on('submit', onSubmit); }); -})(window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/forgotpasswordpin.js b/dashboard-ui/scripts/forgotpasswordpin.js index d6c5c6f1d8..b2f35d0655 100644 --- a/dashboard-ui/scripts/forgotpasswordpin.js +++ b/dashboard-ui/scripts/forgotpasswordpin.js @@ -1,4 +1,4 @@ -(function (window) { +define(['jQuery'], function ($) { function processForgotPasswordResult(page, result) { @@ -58,4 +58,4 @@ $('form', page).off('submit', onSubmit).on('submit', onSubmit); }); -})(window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js index 9c4f4b1fc1..8f809d01d3 100644 --- a/dashboard-ui/scripts/gamegenrepage.js +++ b/dashboard-ui/scripts/gamegenrepage.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { // The base query options var query = { @@ -80,4 +80,4 @@ reloadItems(this); }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js index 76e28a5b57..adc2f5b309 100644 --- a/dashboard-ui/scripts/gamespage.js +++ b/dashboard-ui/scripts/gamespage.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; @@ -182,4 +182,4 @@ }); }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/gamesrecommendedpage.js b/dashboard-ui/scripts/gamesrecommendedpage.js index d23d255423..ce1fdb3568 100644 --- a/dashboard-ui/scripts/gamesrecommendedpage.js +++ b/dashboard-ui/scripts/gamesrecommendedpage.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { $(document).on('pagebeforeshow', "#gamesRecommendedPage", function () { @@ -68,4 +68,4 @@ }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js index 779d5092ac..d168bd35c8 100644 --- a/dashboard-ui/scripts/gamestudiospage.js +++ b/dashboard-ui/scripts/gamestudiospage.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { // The base query options var query = { @@ -81,4 +81,4 @@ reloadItems(this); }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/gamesystemspage.js b/dashboard-ui/scripts/gamesystemspage.js index 44747ce518..f1231ff5a9 100644 --- a/dashboard-ui/scripts/gamesystemspage.js +++ b/dashboard-ui/scripts/gamesystemspage.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { // The base query options var query = { @@ -73,4 +73,4 @@ updateFilterControls(this); }); -})(jQuery, document); +}); diff --git a/dashboard-ui/scripts/homenextup.js b/dashboard-ui/scripts/homenextup.js index 6650c7d285..104c89848e 100644 --- a/dashboard-ui/scripts/homenextup.js +++ b/dashboard-ui/scripts/homenextup.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function reload(page) { @@ -61,4 +61,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/homeupcoming.js b/dashboard-ui/scripts/homeupcoming.js index 9b0413c8e3..57f43af530 100644 --- a/dashboard-ui/scripts/homeupcoming.js +++ b/dashboard-ui/scripts/homeupcoming.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function loadUpcoming(page) { Dashboard.showLoadingMsg(); @@ -127,4 +127,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index ef17ec6d2e..d8afc051d6 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -1,4 +1,4 @@ -define(['libraryBrowser'], function (libraryBrowser) { +define(['libraryBrowser', 'jQuery'], function (libraryBrowser, $) { var defaultFirstSection = 'smalllibrarytiles'; diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js index bf3bde549f..e6929b1d23 100644 --- a/dashboard-ui/scripts/itembynamedetailpage.js +++ b/dashboard-ui/scripts/itembynamedetailpage.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function renderItems(page, item) { @@ -337,4 +337,4 @@ renderItems: renderItems }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 775e5df6eb..f2209860f7 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -1,4 +1,4 @@ -define(['layoutManager'], function (layoutManager) { +define(['layoutManager', 'jQuery'], function (layoutManager, $) { var currentItem; diff --git a/dashboard-ui/scripts/kids.js b/dashboard-ui/scripts/kids.js index 8daa7df015..70ce3f0572 100644 --- a/dashboard-ui/scripts/kids.js +++ b/dashboard-ui/scripts/kids.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function showSignIn(page) { @@ -120,4 +120,4 @@ $('.kidsOptionsForm').off('submit', onOptionsSubmit).on('submit', onOptionsSubmit); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index a31388faf4..5534ad8584 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1,4 +1,4 @@ -define(['playlistManager', 'appSettings', 'appStorage'], function (playlistManager, appSettings, appStorage) { +define(['playlistManager', 'appSettings', 'appStorage', 'jQuery'], function (playlistManager, appSettings, appStorage, $) { var libraryBrowser = (function (window, document, screen) { diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 1b0ed63eca..08291eb5d8 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -1,4 +1,4 @@ -define(['imageLoader', 'paper-icon-button', 'paper-button', 'emby-icons'], function (imageLoader) { +define(['imageLoader', 'jQuery', 'paper-icon-button', 'paper-button', 'emby-icons'], function (imageLoader, $) { function renderHeader() { diff --git a/dashboard-ui/scripts/librarypathmapping.js b/dashboard-ui/scripts/librarypathmapping.js index c0d022a4f3..439bed7ddf 100644 --- a/dashboard-ui/scripts/librarypathmapping.js +++ b/dashboard-ui/scripts/librarypathmapping.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { var currentConfig; @@ -138,4 +138,4 @@ }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/scripts/librarysettings.js index ffedb9b07d..f740aea63c 100644 --- a/dashboard-ui/scripts/librarysettings.js +++ b/dashboard-ui/scripts/librarysettings.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config) { @@ -67,4 +67,4 @@ }); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/livetvchannel.js b/dashboard-ui/scripts/livetvchannel.js index c98d57665b..143b94ad3c 100644 --- a/dashboard-ui/scripts/livetvchannel.js +++ b/dashboard-ui/scripts/livetvchannel.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function renderPrograms(page, result) { @@ -120,4 +120,4 @@ renderPrograms: loadPrograms }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvchannels.js b/dashboard-ui/scripts/livetvchannels.js index ccfc3e1554..3b759c75d4 100644 --- a/dashboard-ui/scripts/livetvchannels.js +++ b/dashboard-ui/scripts/livetvchannels.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; @@ -119,4 +119,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvcomponents.js b/dashboard-ui/scripts/livetvcomponents.js index adc1e18c51..e046aa9072 100644 --- a/dashboard-ui/scripts/livetvcomponents.js +++ b/dashboard-ui/scripts/livetvcomponents.js @@ -1,4 +1,4 @@ -(function () { +define([], function () { function getTimersHtml(timers) { @@ -145,9 +145,9 @@ getTimersHtml: getTimersHtml }; -})(); +}); -(function ($, document, window) { +define(['jQuery'], function ($) { var showOverlayTimeout; var hideOverlayTimeout; @@ -405,4 +405,4 @@ .on('click', childSelector, onProgramClicked); }; -})(jQuery, document, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js index c6c69d6f96..14e414b16e 100644 --- a/dashboard-ui/scripts/livetvguide.js +++ b/dashboard-ui/scripts/livetvguide.js @@ -1,4 +1,4 @@ -(function ($, document) { +define([], function () { window.LiveTvPage.initGuideTab = function (page, tabContent) { @@ -22,4 +22,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvguideprovider.js b/dashboard-ui/scripts/livetvguideprovider.js index 2ac429815a..30bf0d5e95 100644 --- a/dashboard-ui/scripts/livetvguideprovider.js +++ b/dashboard-ui/scripts/livetvguideprovider.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function init(page, type, providerId) { @@ -40,4 +40,4 @@ loadTemplate(page, type, providerId); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js index b4ea9531f5..1b0e56e03a 100644 --- a/dashboard-ui/scripts/livetvitems.js +++ b/dashboard-ui/scripts/livetvitems.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster'); @@ -109,4 +109,4 @@ reloadItems(page); }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvrecordinglist.js b/dashboard-ui/scripts/livetvrecordinglist.js index 635daa159a..cb37e9051c 100644 --- a/dashboard-ui/scripts/livetvrecordinglist.js +++ b/dashboard-ui/scripts/livetvrecordinglist.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { // The base query options var query = { @@ -119,4 +119,4 @@ updateFilterControls(this); }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js index f1a7577ac1..9bd11972ce 100644 --- a/dashboard-ui/scripts/livetvrecordings.js +++ b/dashboard-ui/scripts/livetvrecordings.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function getRecordingGroupHtml(group) { @@ -125,4 +125,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvseriestimer.js b/dashboard-ui/scripts/livetvseriestimer.js index dcad7847f8..3d9ffbec83 100644 --- a/dashboard-ui/scripts/livetvseriestimer.js +++ b/dashboard-ui/scripts/livetvseriestimer.js @@ -1,4 +1,4 @@ -(function (window, $, document) { +define(['jQuery'], function ($) { var currentItem; @@ -221,4 +221,4 @@ currentItem = null; }); -})(window, jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js index faebf28eb8..88994f7734 100644 --- a/dashboard-ui/scripts/livetvseriestimers.js +++ b/dashboard-ui/scripts/livetvseriestimers.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var query = { @@ -120,4 +120,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js index aab6ce4349..76579f57e3 100644 --- a/dashboard-ui/scripts/livetvsettings.js +++ b/dashboard-ui/scripts/livetvsettings.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config) { @@ -88,4 +88,4 @@ }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js index 6689b39a29..7d934771b9 100644 --- a/dashboard-ui/scripts/livetvstatus.js +++ b/dashboard-ui/scripts/livetvstatus.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function resetTuner(page, id) { @@ -532,4 +532,4 @@ }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js index 13a45584b1..18d7f2a4ec 100644 --- a/dashboard-ui/scripts/livetvsuggested.js +++ b/dashboard-ui/scripts/livetvsuggested.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function enableScrollX() { return browserInfo.mobile && AppInfo.enableAppLayouts; @@ -212,4 +212,4 @@ initSuggestedTab: initSuggestedTab }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvtimer.js b/dashboard-ui/scripts/livetvtimer.js index 7939214f35..2d2c53085c 100644 --- a/dashboard-ui/scripts/livetvtimer.js +++ b/dashboard-ui/scripts/livetvtimer.js @@ -1,4 +1,4 @@ -(function (window, $, document) { +define(['jQuery'], function ($) { var currentItem; @@ -127,4 +127,4 @@ currentItem = null; }); -})(window, jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js index d77b75cdb5..e6d082d5f5 100644 --- a/dashboard-ui/scripts/livetvtimers.js +++ b/dashboard-ui/scripts/livetvtimers.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function deleteTimer(page, id) { @@ -55,4 +55,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/logpage.js b/dashboard-ui/scripts/logpage.js index 1e33bd018a..b2d797d6b8 100644 --- a/dashboard-ui/scripts/logpage.js +++ b/dashboard-ui/scripts/logpage.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { $(document).on('pagebeforeshow', "#logPage", function () { @@ -62,4 +62,4 @@ }); }); -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js index eeee7ea3ba..d21ab694d6 100644 --- a/dashboard-ui/scripts/medialibrarypage.js +++ b/dashboard-ui/scripts/medialibrarypage.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { function changeCollectionType(page, virtualFolder) { @@ -474,4 +474,4 @@ var WizardLibraryPage = { }); -})(jQuery, document, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js index 3dbffef489..15fa211da2 100644 --- a/dashboard-ui/scripts/metadataadvanced.js +++ b/dashboard-ui/scripts/metadataadvanced.js @@ -1,4 +1,4 @@ -(function (window, $) { +define(['jQuery'], function ($) { function loadAdvancedConfig(page, config) { @@ -218,4 +218,4 @@ }); } -})(window, jQuery); +}); diff --git a/dashboard-ui/scripts/metadataconfigurationpage.js b/dashboard-ui/scripts/metadataconfigurationpage.js index a16f031a6b..b0e7939644 100644 --- a/dashboard-ui/scripts/metadataconfigurationpage.js +++ b/dashboard-ui/scripts/metadataconfigurationpage.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { function load(page, config, allCultures, allCountries) { if (!config || !allCultures || !allCountries) { @@ -103,4 +103,4 @@ }); }); -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js index 4ab445ed53..de4c10e6f1 100644 --- a/dashboard-ui/scripts/metadataimagespage.js +++ b/dashboard-ui/scripts/metadataimagespage.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { var currentType; @@ -562,4 +562,4 @@ loadPage(page); }); -})(jQuery, document, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/metadatanfo.js b/dashboard-ui/scripts/metadatanfo.js index 29a80214e5..e64c6fcb39 100644 --- a/dashboard-ui/scripts/metadatanfo.js +++ b/dashboard-ui/scripts/metadatanfo.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { var metadataKey = "xbmcmetadata"; @@ -60,4 +60,4 @@ }); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/metadatasubtitles.js b/dashboard-ui/scripts/metadatasubtitles.js index eb199df59b..e0cb88daf0 100644 --- a/dashboard-ui/scripts/metadatasubtitles.js +++ b/dashboard-ui/scripts/metadatasubtitles.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config, languages) { @@ -97,4 +97,4 @@ }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index 3c7ef7aefc..c09d26c87c 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; function getPageData() { @@ -235,4 +235,4 @@ initPage(tabContent); }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js index 33977975d7..9509fcfb02 100644 --- a/dashboard-ui/scripts/moviegenres.js +++ b/dashboard-ui/scripts/moviegenres.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; function getPageData() { @@ -148,4 +148,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index b15d08faf2..4cc81eca0d 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; @@ -308,4 +308,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js index 27d8e3794e..73e984cac8 100644 --- a/dashboard-ui/scripts/moviesrecommended.js +++ b/dashboard-ui/scripts/moviesrecommended.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function getView() { @@ -390,4 +390,4 @@ } } -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js index 3930e1c4bd..375dfedbdb 100644 --- a/dashboard-ui/scripts/moviestudios.js +++ b/dashboard-ui/scripts/moviestudios.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { // The base query options var data = {}; @@ -92,4 +92,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index 9105aa91c0..001bd4d908 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; @@ -200,4 +200,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js index 628a5cfe98..4d96930f5c 100644 --- a/dashboard-ui/scripts/musicalbumartists.js +++ b/dashboard-ui/scripts/musicalbumartists.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; function getPageData(context) { @@ -189,4 +189,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js index d100ec8905..fcc7912cd9 100644 --- a/dashboard-ui/scripts/musicalbums.js +++ b/dashboard-ui/scripts/musicalbums.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; function getPageData(context) { @@ -250,4 +250,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js index bf5f564767..76a85fbe8c 100644 --- a/dashboard-ui/scripts/musicartists.js +++ b/dashboard-ui/scripts/musicartists.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; function getPageData(context) { @@ -189,4 +189,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/musicfolders.js b/dashboard-ui/scripts/musicfolders.js index a14b66d906..6e1d5fa896 100644 --- a/dashboard-ui/scripts/musicfolders.js +++ b/dashboard-ui/scripts/musicfolders.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; function getPageData() { @@ -107,4 +107,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js index db617addef..292602ca10 100644 --- a/dashboard-ui/scripts/musicgenres.js +++ b/dashboard-ui/scripts/musicgenres.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; function getPageData() { @@ -127,4 +127,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js index 7d12be2031..dd68b578d5 100644 --- a/dashboard-ui/scripts/musicrecommended.js +++ b/dashboard-ui/scripts/musicrecommended.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function itemsPerRow() { @@ -329,4 +329,4 @@ }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js index 887e177d76..be0c7179b3 100644 --- a/dashboard-ui/scripts/mypreferencesdisplay.js +++ b/dashboard-ui/scripts/mypreferencesdisplay.js @@ -1,4 +1,4 @@ -define(['userSettings', 'appStorage'], function (userSettings, appStorage) { +define(['userSettings', 'appStorage', 'jQuery'], function (userSettings, appStorage, $) { function loadForm(page, user) { diff --git a/dashboard-ui/scripts/mypreferenceshome.js b/dashboard-ui/scripts/mypreferenceshome.js index 4f548ae8bd..59cfa67d37 100644 --- a/dashboard-ui/scripts/mypreferenceshome.js +++ b/dashboard-ui/scripts/mypreferenceshome.js @@ -1,4 +1,4 @@ -(function ($, window, document) { +define(['jQuery'], function ($) { function renderViews(page, user, result) { @@ -332,4 +332,4 @@ } }); -})(jQuery, window, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/mypreferenceslanguages.js b/dashboard-ui/scripts/mypreferenceslanguages.js index 9845d7619a..979f32425b 100644 --- a/dashboard-ui/scripts/mypreferenceslanguages.js +++ b/dashboard-ui/scripts/mypreferenceslanguages.js @@ -1,4 +1,4 @@ -define(['appSettings', 'userSettings'], function (appSettings, userSettings) { +define(['appSettings', 'userSettings', 'jQuery'], function (appSettings, userSettings, $) { function populateLanguages(select, languages) { diff --git a/dashboard-ui/scripts/myprofile.js b/dashboard-ui/scripts/myprofile.js index cd63df3463..299455fcb6 100644 --- a/dashboard-ui/scripts/myprofile.js +++ b/dashboard-ui/scripts/myprofile.js @@ -1,4 +1,4 @@ -(function ($, window, document, FileReader) { +define(['jQuery'], function ($) { var currentFile; @@ -224,9 +224,9 @@ }); -})(jQuery, window, document, window.FileReader); +}); -(function ($, document, window) { +define(['jQuery'], function ($) { function loadUser(page) { @@ -465,4 +465,4 @@ }); -})(jQuery, document, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/mysync.js b/dashboard-ui/scripts/mysync.js index ba45f1bd99..5107520334 100644 --- a/dashboard-ui/scripts/mysync.js +++ b/dashboard-ui/scripts/mysync.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { function refreshSyncStatus(page) { @@ -78,4 +78,4 @@ } }); -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/mysyncsettings.js b/dashboard-ui/scripts/mysyncsettings.js index 5898561ed4..6831bdba4b 100644 --- a/dashboard-ui/scripts/mysyncsettings.js +++ b/dashboard-ui/scripts/mysyncsettings.js @@ -1,4 +1,4 @@ -define(['appSettings'], function (appSettings) { +define(['appSettings', 'jQuery'], function (appSettings, $) { function loadForm(page, user) { diff --git a/dashboard-ui/scripts/notificationsetting.js b/dashboard-ui/scripts/notificationsetting.js index 4d607ad16a..a0237c47f4 100644 --- a/dashboard-ui/scripts/notificationsetting.js +++ b/dashboard-ui/scripts/notificationsetting.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { var notificationsConfigurationKey = "notifications"; @@ -184,4 +184,4 @@ reload(page); }); -})(jQuery, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/notificationsettings.js b/dashboard-ui/scripts/notificationsettings.js index 73cea213f6..35f1a2b2f9 100644 --- a/dashboard-ui/scripts/notificationsettings.js +++ b/dashboard-ui/scripts/notificationsettings.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { function reload(page) { @@ -71,4 +71,4 @@ }); }); -})(jQuery, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js index 297fbc8441..2550347cbf 100644 --- a/dashboard-ui/scripts/nowplayingpage.js +++ b/dashboard-ui/scripts/nowplayingpage.js @@ -1,4 +1,4 @@ -(function (window, document, $, setTimeout, clearTimeout) { +define(['jQuery'], function ($) { pageIdOn('pageinit', "nowPlayingPage", function () { @@ -40,4 +40,4 @@ document.body.classList.remove('hiddenNowPlayingBar'); }); -})(window, document, jQuery, setTimeout, clearTimeout); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/photos.js b/dashboard-ui/scripts/photos.js index fced03cdcf..aac886205b 100644 --- a/dashboard-ui/scripts/photos.js +++ b/dashboard-ui/scripts/photos.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var view = 'Poster'; @@ -213,4 +213,4 @@ startSlideshow: startSlideshow }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/playbackconfiguration.js b/dashboard-ui/scripts/playbackconfiguration.js index 6d965f126e..f0f2555d26 100644 --- a/dashboard-ui/scripts/playbackconfiguration.js +++ b/dashboard-ui/scripts/playbackconfiguration.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config) { @@ -45,4 +45,4 @@ }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/playlists.js b/dashboard-ui/scripts/playlists.js index a7ba04adb1..d16f9bf0a6 100644 --- a/dashboard-ui/scripts/playlists.js +++ b/dashboard-ui/scripts/playlists.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var data = {}; function getPageData() { @@ -168,4 +168,4 @@ reloadItems(page); }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/plugincatalogpage.js b/dashboard-ui/scripts/plugincatalogpage.js index 2e07aeacec..544da37c48 100644 --- a/dashboard-ui/scripts/plugincatalogpage.js +++ b/dashboard-ui/scripts/plugincatalogpage.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { // The base query options var query = { @@ -297,4 +297,4 @@ renderCatalog: populateList }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/pluginspage.js b/dashboard-ui/scripts/pluginspage.js index 2523295975..cca463743c 100644 --- a/dashboard-ui/scripts/pluginspage.js +++ b/dashboard-ui/scripts/pluginspage.js @@ -1,4 +1,4 @@ -(function ($, window) { +define(['jQuery'], function ($) { function deletePlugin(page, uniqueid, name) { @@ -233,4 +233,4 @@ renderPlugins: renderPlugins }; -})(jQuery, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/remotecontrol.js b/dashboard-ui/scripts/remotecontrol.js index 1f8186bc9c..28a6a45884 100644 --- a/dashboard-ui/scripts/remotecontrol.js +++ b/dashboard-ui/scripts/remotecontrol.js @@ -1,4 +1,4 @@ -(function (window, document) { +define([], function () { function sendPlayCommand(options, playType) { @@ -396,4 +396,4 @@ initializeApiClient(apiClient); }); -})(window, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/reports.js b/dashboard-ui/scripts/reports.js index a7bd561539..7ccb3c65e3 100644 --- a/dashboard-ui/scripts/reports.js +++ b/dashboard-ui/scripts/reports.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var defaultSortBy = "SortName"; var topItems = 5; @@ -910,9 +910,9 @@ updateFilterControls(this); }); -})(jQuery, document); +}); -(function (window) { +define(['jQuery'], function ($) { function renderOptions(page, selector, cssClass, items) { @@ -1145,4 +1145,4 @@ loadColumns: loadColumns, onPageShow: onPageReportColumnsShow }; -})(window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/scheduledtaskspage.js b/dashboard-ui/scripts/scheduledtaskspage.js index 82f1e89453..b780cbdd3a 100644 --- a/dashboard-ui/scripts/scheduledtaskspage.js +++ b/dashboard-ui/scripts/scheduledtaskspage.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function reloadList(page) { @@ -296,4 +296,4 @@ stopInterval(); }); -})(jQuery, document, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/searchpage.js b/dashboard-ui/scripts/searchpage.js index 13bcaa774f..ff62c4b1e1 100644 --- a/dashboard-ui/scripts/searchpage.js +++ b/dashboard-ui/scripts/searchpage.js @@ -1,4 +1,4 @@ -(function () { +define([], function () { function loadSuggestions(page) { @@ -38,4 +38,4 @@ }); -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js index 474f103c2b..b8ab923d87 100644 --- a/dashboard-ui/scripts/sections.js +++ b/dashboard-ui/scripts/sections.js @@ -1,4 +1,4 @@ -define(['libraryBrowser'], function (LibraryBrowser) { +define(['libraryBrowser', 'jQuery'], function (LibraryBrowser, $) { function getUserViews(userId) { diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js index dc7bc8c52a..36c5401260 100644 --- a/dashboard-ui/scripts/selectserver.js +++ b/dashboard-ui/scripts/selectserver.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { function connectToServer(page, server) { @@ -357,4 +357,4 @@ loadPage(page); }); -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/serversecurity.js b/dashboard-ui/scripts/serversecurity.js index 28039264c2..44eee3fc04 100644 --- a/dashboard-ui/scripts/serversecurity.js +++ b/dashboard-ui/scripts/serversecurity.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function revoke(page, key) { @@ -141,4 +141,4 @@ loadData(page); }); -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/shared.js b/dashboard-ui/scripts/shared.js index 41c3ef6fec..6f5ea955a6 100644 --- a/dashboard-ui/scripts/shared.js +++ b/dashboard-ui/scripts/shared.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { var currentItem; @@ -87,4 +87,4 @@ }); -})(jQuery, document, window); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/sharingmanager.js b/dashboard-ui/scripts/sharingmanager.js index f320a35c07..0472679add 100644 --- a/dashboard-ui/scripts/sharingmanager.js +++ b/dashboard-ui/scripts/sharingmanager.js @@ -1,4 +1,4 @@ -(function () { +define([], function () { function onSharingSuccess(options) { @@ -56,4 +56,4 @@ showMenu: showMenu }; -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index b3b5d3a5a3..d90f9c21a3 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var defaultSortBy = "Album,SortName"; @@ -165,4 +165,4 @@ } }; -})(jQuery, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/streamingsettings.js b/dashboard-ui/scripts/streamingsettings.js index 387d9ac54b..fbed8e6975 100644 --- a/dashboard-ui/scripts/streamingsettings.js +++ b/dashboard-ui/scripts/streamingsettings.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config) { @@ -65,4 +65,4 @@ }); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/supporterkeypage.js b/dashboard-ui/scripts/supporterkeypage.js index b3be1de8c9..ef85dd381a 100644 --- a/dashboard-ui/scripts/supporterkeypage.js +++ b/dashboard-ui/scripts/supporterkeypage.js @@ -1,4 +1,4 @@ -define(['fetchHelper'], function (fetchHelper) { +define(['fetchHelper', 'jQuery'], function (fetchHelper, $) { function load(page) { Dashboard.showLoadingMsg(); diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js index 96a6450dfc..6597adee91 100644 --- a/dashboard-ui/scripts/syncactivity.js +++ b/dashboard-ui/scripts/syncactivity.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { function cancelJob(page, id) { @@ -432,4 +432,4 @@ Events.off(ApiClient, "websocketmessage", onWebSocketMessage); }); -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js index 7851931b60..da6c6331af 100644 --- a/dashboard-ui/scripts/syncjob.js +++ b/dashboard-ui/scripts/syncjob.js @@ -1,4 +1,4 @@ -(function () { +define(['jQuery'], function ($) { function renderJob(page, job, dialogOptions) { @@ -428,4 +428,4 @@ Events.off(ApiClient, "websocketmessage", onWebSocketMessage); }); -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/syncsettings.js b/dashboard-ui/scripts/syncsettings.js index 9766d5ae80..9e2e55fda5 100644 --- a/dashboard-ui/scripts/syncsettings.js +++ b/dashboard-ui/scripts/syncsettings.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function loadPage(page, config) { @@ -67,4 +67,4 @@ }); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js index 87bfaf21da..43d844da61 100644 --- a/dashboard-ui/scripts/tvgenres.js +++ b/dashboard-ui/scripts/tvgenres.js @@ -1,4 +1,4 @@ -define([], function () { +define(['jQuery'], function ($) { return function (view, params, tabContent) { diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index ca1494e6b8..6841b1da8b 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -1,4 +1,4 @@ -define([], function () { +define(['jQuery'], function ($) { return function (view, params, tabContent) { diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js index bb17f0a1e8..812198cd8a 100644 --- a/dashboard-ui/scripts/tvstudios.js +++ b/dashboard-ui/scripts/tvstudios.js @@ -1,4 +1,4 @@ -define([], function () { +define(['jQuery'], function ($) { // The base query options var data = {}; diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js index 2691cb35ac..eedb2c68e6 100644 --- a/dashboard-ui/scripts/useredit.js +++ b/dashboard-ui/scripts/useredit.js @@ -1,4 +1,4 @@ -(function ($, window, document) { +define(['jQuery'], function ($) { var currentUser; @@ -238,4 +238,4 @@ }); -})(jQuery, window, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js index 56ff369753..5c8f4d5a6b 100644 --- a/dashboard-ui/scripts/userlibraryaccess.js +++ b/dashboard-ui/scripts/userlibraryaccess.js @@ -1,4 +1,4 @@ -(function ($, window, document) { +define(['jQuery'], function ($) { function loadMediaFolders(page, user, mediaFolders) { @@ -247,4 +247,4 @@ }); }); -})(jQuery, window, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js index b7a4b6d0e3..59480a8c40 100644 --- a/dashboard-ui/scripts/usernew.js +++ b/dashboard-ui/scripts/usernew.js @@ -1,4 +1,4 @@ -(function ($, window, document) { +define(['jQuery'], function ($) { function loadMediaFolders(page, mediaFolders) { @@ -175,4 +175,4 @@ }); -})(jQuery, window, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js index a27dd9becd..9a2a09ee20 100644 --- a/dashboard-ui/scripts/userparentalcontrol.js +++ b/dashboard-ui/scripts/userparentalcontrol.js @@ -1,4 +1,4 @@ -(function ($, window, document) { +define(['jQuery'], function ($) { function populateRatings(allParentalRatings, page) { @@ -397,4 +397,4 @@ }); }); -})(jQuery, window, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/userpassword.js b/dashboard-ui/scripts/userpassword.js index 41b63a6fb7..384a858600 100644 --- a/dashboard-ui/scripts/userpassword.js +++ b/dashboard-ui/scripts/userpassword.js @@ -1,4 +1,4 @@ -(function ($, window, document) { +define(['jQuery'], function ($) { function loadUser(page, user) { @@ -41,4 +41,4 @@ }); -})(jQuery, window, document); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js index 61eadcb999..5d43c1c3a2 100644 --- a/dashboard-ui/scripts/userprofilespage.js +++ b/dashboard-ui/scripts/userprofilespage.js @@ -1,4 +1,4 @@ -(function (document, window, $) { +define(['jQuery'], function ($) { function deleteUser(page, id) { @@ -379,4 +379,4 @@ loadData(page); }); -})(document, window, jQuery); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/wizardagreement.js b/dashboard-ui/scripts/wizardagreement.js index 357a2bf919..09ef593ba7 100644 --- a/dashboard-ui/scripts/wizardagreement.js +++ b/dashboard-ui/scripts/wizardagreement.js @@ -1,4 +1,4 @@ -(function (window, $) { +define(['jQuery'], function ($) { function onSubmit() { @@ -22,4 +22,4 @@ $('.wizardAgreementForm').off('submit', onSubmit).on('submit', onSubmit); }); -})(window, jQuery); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/wizardfinishpage.js b/dashboard-ui/scripts/wizardfinishpage.js index 9a8c009c03..1a854a77f6 100644 --- a/dashboard-ui/scripts/wizardfinishpage.js +++ b/dashboard-ui/scripts/wizardfinishpage.js @@ -1,4 +1,4 @@ -(function(){ +define(['jQuery'], function ($) { function onFinish() { @@ -18,4 +18,4 @@ $('.btnWizardNext', this).on('click', onFinish); }); -})(); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/wizardlivetvguide.js b/dashboard-ui/scripts/wizardlivetvguide.js index c9609e0440..b48d1a9f3f 100644 --- a/dashboard-ui/scripts/wizardlivetvguide.js +++ b/dashboard-ui/scripts/wizardlivetvguide.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { var guideController; @@ -98,4 +98,4 @@ reload(page); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/wizardlivetvtuner.js b/dashboard-ui/scripts/wizardlivetvtuner.js index 3d99b19663..6ab57415d5 100644 --- a/dashboard-ui/scripts/wizardlivetvtuner.js +++ b/dashboard-ui/scripts/wizardlivetvtuner.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function save(page) { @@ -96,4 +96,4 @@ reload(page); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/wizardservice.js b/dashboard-ui/scripts/wizardservice.js index dc8922c6c8..49dcc6f54a 100644 --- a/dashboard-ui/scripts/wizardservice.js +++ b/dashboard-ui/scripts/wizardservice.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { $(document).on('pageinit', "#wizardServicePage", function () { @@ -10,4 +10,4 @@ }); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js index f1a9a1c667..d607b0f47e 100644 --- a/dashboard-ui/scripts/wizardsettings.js +++ b/dashboard-ui/scripts/wizardsettings.js @@ -1,4 +1,4 @@ -(function ($, document) { +define(['jQuery'], function ($) { function save(page) { @@ -115,4 +115,4 @@ reload(page); }); -})(jQuery, document, window); +}); diff --git a/dashboard-ui/scripts/wizardstartpage.js b/dashboard-ui/scripts/wizardstartpage.js index 4cd469042b..819f21a9ac 100644 --- a/dashboard-ui/scripts/wizardstartpage.js +++ b/dashboard-ui/scripts/wizardstartpage.js @@ -1,4 +1,4 @@ -(function (window, $) { +define(['jQuery'], function ($) { function loadPage(page, config, languageOptions) { @@ -67,4 +67,4 @@ }); }); -})(window, jQuery); \ No newline at end of file +}); \ No newline at end of file diff --git a/dashboard-ui/scripts/wizarduserpage.js b/dashboard-ui/scripts/wizarduserpage.js index 5de1de3440..35df931e78 100644 --- a/dashboard-ui/scripts/wizarduserpage.js +++ b/dashboard-ui/scripts/wizarduserpage.js @@ -1,4 +1,4 @@ -(function ($, document, window) { +define(['jQuery'], function ($) { function getApiClient() { return ApiClient; @@ -100,4 +100,4 @@ }); }); -})(jQuery, document, window); \ No newline at end of file +}); \ No newline at end of file