Merge pull request #1243 from jellyfin/refactor

Refactor a bunch of filenames and folders

package.json

@@ -91,9 +91,9 @@
         "test": [
           "src/components/autoFocuser.js",
           "src/components/cardbuilder/cardBuilder.js",
-          "src/components/filedownloader.js",
+          "src/scripts/fileDownloader.js",
           "src/components/images/imageLoader.js",
-          "src/components/lazyloader/lazyloader-intersectionobserver.js",
+          "src/components/lazyLoader/lazyLoaderIntersectionObserver.js",
           "src/components/playback/mediasession.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",
@@ -102,11 +102,11 @@
           "src/scripts/filesystem.js",
           "src/scripts/imagehelper.js",
           "src/scripts/inputManager.js",
-          "src/components/deletehelper.js",
+          "src/scripts/deleteHelper.js",
-          "src/components/actionsheet/actionsheet.js",
+          "src/components/actionSheet/actionSheet.js",
           "src/components/playmenu.js",
           "src/components/indicators/indicators.js",
-          "src/scripts/keyboardnavigation.js",
+          "src/scripts/keyboardNavigation.js",
           "src/scripts/settings/appSettings.js",
           "src/scripts/settings/userSettings.js",
           "src/scripts/settings/webSettings.js"

src/components/accessSchedule/accessSchedule.js

@@ -50,7 +50,7 @@ define(['dialogHelper', 'datetime', 'globalize', 'emby-select', 'paper-icon-butt
         show: function (options) {
             return new Promise(function (resolve, reject) {
                 var xhr = new XMLHttpRequest();
-                xhr.open('GET', 'components/accessschedule/accessschedule.template.html', true);
+                xhr.open('GET', 'components/accessSchedule/accessSchedule.template.html', true);
 
                 xhr.onload = function (e) {
                     var template = this.response;

src/components/actionSheet/actionSheet.js

@@ -3,7 +3,7 @@ import layoutManager from 'layoutManager';
 import globalize from 'globalize';
 import dom from 'dom';
 import 'emby-button';
-import 'css!./actionsheet';
+import 'css!./actionSheet';
 import 'material-icons';
 import 'scrollStyles';
 import 'listViewStyle';

src/components/appFooter/appFooter.js

@@ -1,4 +1,4 @@
-define(['browser', 'css!./appfooter'], function (browser) {
+define(['browser', 'css!./appFooter'], function (browser) {
     'use strict';
 
     function render(options) {

src/components/displaySettings/displaySettings.js

@@ -269,7 +269,7 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
     }
 
     function embed(options, self) {
-        require(['text!./displaysettings.template.html'], function (template) {
+        require(['text!./displaySettings.template.html'], function (template) {
             options.element.innerHTML = globalize.translateDocument(template, 'core');
             options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));
             if (options.enableSaveButton) {

src/components/homeScreenSettings/homeScreenSettings.js

@@ -470,7 +470,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
     function embed(options, self) {
 
-        require(['text!./homescreensettings.template.html'], function (template) {
+        require(['text!./homeScreenSettings.template.html'], function (template) {
 
             for (var i = 1; i <= numConfigurableSections; i++) {
                 template = template.replace('{section' + i + 'label}', globalize.translate('LabelHomeScreenSectionValue', i));

src/components/imageDownloader/imageDownloader.js

@@ -320,7 +320,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
     function showEditor(itemId, serverId, itemType) {
         loading.show();
 
-        require(['text!./imagedownloader.template.html'], function (template) {
+        require(['text!./imageDownloader.template.html'], function (template) {
 
             var apiClient = connectionManager.getApiClient(serverId);
 

src/components/imageOptionsEditor/imageOptionsEditor.js

@@ -82,7 +82,7 @@ define(['globalize', 'dom', 'dialogHelper', 'emby-checkbox', 'emby-select', 'emb
         this.show = function (itemType, options, availableOptions) {
             return new Promise(function (resolve, reject) {
                 var xhr = new XMLHttpRequest();
-                xhr.open('GET', 'components/imageoptionseditor/imageoptionseditor.template.html', true);
+                xhr.open('GET', 'components/imageOptionsEditor/imageOptionsEditor.template.html', true);
 
                 xhr.onload = function (e) {
                     var template = this.response;

src/components/imageUploader/imageUploader.js

@@ -125,7 +125,7 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
 
         options = options || {};
 
-        require(['text!./imageuploader.template.html'], function (template) {
+        require(['text!./imageUploader.template.html'], function (template) {
 
             currentItemId = options.itemId;
             currentServerId = options.serverId;

src/components/mediaLibraryCreator/mediaLibraryCreator.js

@@ -182,7 +182,7 @@ define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionsed
                 currentResolve = resolve;
                 hasChanges = false;
                 var xhr = new XMLHttpRequest();
-                xhr.open('GET', 'components/medialibrarycreator/medialibrarycreator.template.html', true);
+                xhr.open('GET', 'components/mediaLibraryCreator/mediaLibraryCreator.template.html', true);
 
                 xhr.onload = function (e) {
                     var template = this.response;

src/components/mediaLibraryEditor/mediaLibraryEditor.js

@@ -199,7 +199,7 @@ define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionsed
             currentDeferred = deferred;
             hasChanges = false;
             var xhr = new XMLHttpRequest();
-            xhr.open('GET', 'components/medialibraryeditor/medialibraryeditor.template.html', true);
+            xhr.open('GET', 'components/mediaLibraryEditor/mediaLibraryEditor.template.html', true);
 
             xhr.onload = function (e) {
                 var template = this.response;

src/components/metadataEditor/metadataEditor.js

@@ -1067,7 +1067,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     function show(itemId, serverId, resolve, reject) {
         loading.show();
 
-        require(['text!./metadataeditor.template.html'], function (template) {
+        require(['text!./metadataEditor.template.html'], function (template) {
 
             var dialogOptions = {
                 removeOnClose: true,
@@ -1124,7 +1124,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
                 loading.show();
 
-                require(['text!./metadataeditor.template.html'], function (template) {
+                require(['text!./metadataEditor.template.html'], function (template) {
 
                     elem.innerHTML = globalize.translateDocument(template, 'core');
 

src/components/metadataEditor/personEditor.js

@@ -11,7 +11,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-but
     function show(person) {
         return new Promise(function (resolve, reject) {
 
-            require(['text!./personeditor.template.html'], function (template) {
+            require(['text!./personEditor.template.html'], function (template) {
 
                 var dialogOptions = {
                     removeOnClose: true,

src/components/multiSelect/multiSelect.js

@@ -1,4 +1,4 @@
-define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'globalize', 'appRouter', 'dom', 'css!./multiselect'], function (browser, appStorage, appHost, loading, connectionManager, globalize, appRouter, dom) {
+define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'globalize', 'appRouter', 'dom', 'css!./multiSelect'], function (browser, appStorage, appHost, loading, connectionManager, globalize, appRouter, dom) {
     'use strict';
 
     var selectedItems = [];

src/components/nowPlayingBar/nowPlayingBar.js

@@ -244,7 +244,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
 
         return new Promise(function (resolve, reject) {
 
-            require(['appFooter-shared', 'itemShortcuts', 'css!./nowplayingbar.css', 'emby-slider'], function (appfooter, itemShortcuts) {
+            require(['appFooter-shared', 'itemShortcuts', 'css!./nowPlayingBar.css', 'emby-slider'], function (appfooter, itemShortcuts) {
 
                 var parentContainer = appfooter.element;
                 nowPlayingBarElement = parentContainer.querySelector('.nowPlayingBar');

src/components/playbackSettings/playbackSettings.js

@@ -289,7 +289,7 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
 
     function embed(options, self) {
 
-        require(['text!./playbacksettings.template.html'], function (template) {
+        require(['text!./playbackSettings.template.html'], function (template) {
 
             options.element.innerHTML = globalize.translateDocument(template, 'core');
 

src/controllers/livetvstatus.js

@@ -155,7 +155,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
     }
 
     function mapChannels(page, providerId) {
-        require(['components/channelmapper/channelmapper'], function (channelmapper) {
+        require(['components/channelMapper/channelMapper'], function (channelmapper) {
             new channelmapper({
                 serverId: ApiClient.serverInfo().Id,
                 providerId: providerId

src/controllers/userparentalcontrol.js

@@ -191,7 +191,7 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
     function showSchedulePopup(page, schedule, index) {
         schedule = schedule || {};
 
-        require(['components/accessschedule/accessschedule'], function (accessschedule) {
+        require(['components/accessSchedule/accessSchedule'], function (accessschedule) {
             accessschedule.show({
                 schedule: schedule
             }).then(function (updatedSchedule) {

src/scripts/routes.js

@@ -174,6 +174,47 @@ define([
         roles: 'admin',
         controller: 'dashboard/encodingsettings'
     });
+    defineRoute({
+        path: '/log.html',
+        roles: 'admin',
+        controller: 'dashboard/logs'
+    });
+    defineRoute({
+        path: '/metadataimages.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/metadataimagespage'
+    });
+    defineRoute({
+        path: '/metadatanfo.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/metadatanfo'
+    });
+    defineRoute({
+        path: '/notificationsetting.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/notifications/notification'
+    });
+    defineRoute({
+        path: '/notificationsettings.html',
+        controller: 'dashboard/notifications/notifications',
+        autoFocus: false,
+        roles: 'admin'
+    });
+    defineRoute({
+        path: '/playbackconfiguration.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/playbackconfiguration'
+    });
+    defineRoute({
+        path: '/availableplugins.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/plugins/available'
+    });
 
     defineRoute({
         path: '/home.html',
@@ -227,23 +268,6 @@ define([
         roles: 'admin',
         controller: 'livetvtuner'
     });
-    defineRoute({
-        path: '/log.html',
-        roles: 'admin',
-        controller: 'dashboard/logs'
-    });
-    defineRoute({
-        path: '/metadataimages.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/metadataimagespage'
-    });
-    defineRoute({
-        path: '/metadatanfo.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/metadatanfo'
-    });
     defineRoute({
         path: '/movies.html',
         autoFocus: false,
@@ -256,30 +280,6 @@ define([
         autoFocus: false,
         transition: 'fade'
     });
-    defineRoute({
-        path: '/notificationsetting.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/notifications/notification'
-    });
-    defineRoute({
-        path: '/notificationsettings.html',
-        controller: 'dashboard/notifications/notifications',
-        autoFocus: false,
-        roles: 'admin'
-    });
-    defineRoute({
-        path: '/playbackconfiguration.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/playbackconfiguration'
-    });
-    defineRoute({
-        path: '/availableplugins.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/plugins/available'
-    });
     defineRoute({
         path: '/installedplugins.html',
         autoFocus: false,

src/scripts/site.js

@@ -375,8 +375,8 @@ var AppInfo = {};
 
         define('filesystem', [scriptsPath + '/filesystem'], returnFirstDependency);
 
-        define('lazyLoader', [componentsPath + '/lazyloader/lazyloader-intersectionobserver'], returnFirstDependency);
+        define('lazyLoader', [componentsPath + '/lazyLoader/lazyLoaderIntersectionObserver'], returnFirstDependency);
-        define('shell', [componentsPath + '/shell'], returnFirstDependency);
+        define('shell', [scriptsPath + '/shell'], returnFirstDependency);
 
         if ('registerElement' in document) {
             define('registerElement', []);
@@ -397,8 +397,8 @@ var AppInfo = {};
         define('prompt', [componentsPath + '/prompt/prompt'], returnFirstDependency);
 
         define('loading', [componentsPath + '/loading/loading'], returnFirstDependency);
-        define('multi-download', [componentsPath + '/multidownload'], returnFirstDependency);
+        define('multi-download', [scriptsPath + '/multiDownload'], returnFirstDependency);
-        define('fileDownloader', [componentsPath + '/filedownloader'], returnFirstDependency);
+        define('fileDownloader', [scriptsPath + '/fileDownloader'], returnFirstDependency);
 
         define('castSenderApiLoader', [componentsPath + '/castSenderApi'], returnFirstDependency);
     }
@@ -481,16 +481,16 @@ var AppInfo = {};
         var list = [
             'components/playback/playaccessvalidation',
             'components/playback/experimentalwarnings',
-            'components/htmlaudioplayer/plugin',
+            'components/htmlAudioPlayer/plugin',
-            'components/htmlvideoplayer/plugin',
+            'components/htmlVideoPlayer/plugin',
-            'components/photoplayer/plugin',
+            'components/photoPlayer/plugin',
             'components/youtubeplayer/plugin',
-            'components/backdropscreensaver/plugin',
+            'components/backdropScreensaver/plugin',
-            'components/logoscreensaver/plugin'
+            'components/logoScreensaver/plugin'
         ];
 
         if (appHost.supports('remotecontrol')) {
-            list.push('components/sessionplayer');
+            list.push('components/sessionPlayer');
 
             if (browser.chrome || browser.opera) {
                 list.push('components/chromecast/chromecastplayer');
@@ -532,16 +532,16 @@ var AppInfo = {};
 
             window.Emby.Page = appRouter;
 
-            require(['emby-button', 'scripts/themeloader', 'libraryMenu', 'scripts/routes'], function () {
+            require(['emby-button', 'scripts/themeLoader', 'libraryMenu', 'scripts/routes'], function () {
                 Emby.Page.start({
                     click: false,
                     hashbang: true
                 });
 
-                require(['components/thememediaplayer', 'scripts/autobackdrops']);
+                require(['components/themeMediaPlayer', 'scripts/autoBackdrops']);
 
                 if (!browser.tv && !browser.xboxOne && !browser.ps4) {
-                    require(['components/nowplayingbar/nowplayingbar']);
+                    require(['components/nowPlayingBar/nowPlayingBar']);
                 }
 
                 if (appHost.supports('remotecontrol')) {
@@ -630,23 +630,23 @@ var AppInfo = {};
         var scriptsPath = getScriptsPath();
 
         var paths = {
-            browserdeviceprofile: 'scripts/browserdeviceprofile',
+            browserdeviceprofile: 'scripts/browserDeviceProfile',
             browser: 'scripts/browser',
-            libraryBrowser: 'scripts/librarybrowser',
+            libraryBrowser: 'scripts/libraryBrowser',
             inputManager: 'scripts/inputManager',
             datetime: 'scripts/datetime',
             globalize: 'scripts/globalize',
             dfnshelper: 'scripts/dfnshelper',
-            libraryMenu: 'scripts/librarymenu',
+            libraryMenu: 'scripts/libraryMenu',
             playlisteditor: componentsPath + '/playlisteditor/playlisteditor',
-            medialibrarycreator: componentsPath + '/medialibrarycreator/medialibrarycreator',
+            medialibrarycreator: componentsPath + '/mediaLibraryCreator/mediaLibraryCreator',
-            medialibraryeditor: componentsPath + '/medialibraryeditor/medialibraryeditor',
+            medialibraryeditor: componentsPath + '/mediaLibraryEditor/mediaLibraryEditor',
-            imageoptionseditor: componentsPath + '/imageoptionseditor/imageoptionseditor',
+            imageoptionseditor: componentsPath + '/imageOptionsEditor/imageOptionsEditor',
             apphost: componentsPath + '/apphost',
             visibleinviewport: bowerPath + '/visibleinviewport',
-            qualityoptions: componentsPath + '/qualityoptions',
+            qualityoptions: componentsPath + '/qualityOptions',
             focusManager: componentsPath + '/focusManager',
-            itemHelper: componentsPath + '/itemhelper',
+            itemHelper: componentsPath + '/itemHelper',
             itemShortcuts: componentsPath + '/shortcuts',
             playQueueManager: componentsPath + '/playback/playqueuemanager',
             nowPlayingHelper: componentsPath + '/playback/nowplayinghelper',
@@ -738,7 +738,7 @@ var AppInfo = {};
 
         // there are several objects that need to be instantiated
         // TODO find a better way to do this
-        define('appFooter', [componentsPath + '/appfooter/appfooter'], returnFirstDependency);
+        define('appFooter', [componentsPath + '/appFooter/appFooter'], returnFirstDependency);
         define('appFooter-shared', ['appFooter'], createSharedAppFooter);
 
         // TODO remove these libraries
@@ -773,23 +773,23 @@ var AppInfo = {};
 
         define('chromecastHelper', [componentsPath + '/chromecast/chromecasthelpers'], returnFirstDependency);
         define('mediaSession', [componentsPath + '/playback/mediasession'], returnFirstDependency);
-        define('actionsheet', [componentsPath + '/actionsheet/actionsheet'], returnFirstDependency);
+        define('actionsheet', [componentsPath + '/actionSheet/actionSheet'], returnFirstDependency);
-        define('tunerPicker', [componentsPath + '/tunerpicker'], returnFirstDependency);
+        define('tunerPicker', [componentsPath + '/tunerPicker'], returnFirstDependency);
         define('mainTabsManager', [componentsPath + '/maintabsmanager'], returnFirstDependency);
         define('imageLoader', [componentsPath + '/images/imageLoader'], returnFirstDependency);
         define('directorybrowser', [componentsPath + '/directorybrowser/directorybrowser'], returnFirstDependency);
-        define('metadataEditor', [componentsPath + '/metadataeditor/metadataeditor'], returnFirstDependency);
+        define('metadataEditor', [componentsPath + '/metadataEditor/metadataEditor'], returnFirstDependency);
-        define('personEditor', [componentsPath + '/metadataeditor/personeditor'], returnFirstDependency);
+        define('personEditor', [componentsPath + '/metadataEditor/personEditor'], returnFirstDependency);
         define('playerSelectionMenu', [componentsPath + '/playback/playerSelectionMenu'], returnFirstDependency);
         define('playerSettingsMenu', [componentsPath + '/playback/playersettingsmenu'], returnFirstDependency);
         define('playMethodHelper', [componentsPath + '/playback/playmethodhelper'], returnFirstDependency);
         define('brightnessOsd', [componentsPath + '/playback/brightnessosd'], returnFirstDependency);
         define('alphaNumericShortcuts', [scriptsPath + '/alphanumericshortcuts'], returnFirstDependency);
-        define('multiSelect', [componentsPath + '/multiselect/multiselect'], returnFirstDependency);
+        define('multiSelect', [componentsPath + '/multiSelect/multiSelect'], returnFirstDependency);
-        define('alphaPicker', [componentsPath + '/alphapicker/alphapicker'], returnFirstDependency);
+        define('alphaPicker', [componentsPath + '/alphaPicker/alphaPicker'], returnFirstDependency);
         define('tabbedView', [componentsPath + '/tabbedview/tabbedview'], returnFirstDependency);
         define('itemsTab', [componentsPath + '/tabbedview/itemstab'], returnFirstDependency);
-        define('collectionEditor', [componentsPath + '/collectioneditor/collectioneditor'], returnFirstDependency);
+        define('collectionEditor', [componentsPath + '/collectionEditor/collectionEditor'], returnFirstDependency);
         define('serverRestartDialog', [componentsPath + '/serverRestartDialog'], returnFirstDependency);
         define('playlistEditor', [componentsPath + '/playlisteditor/playlisteditor'], returnFirstDependency);
         define('recordingCreator', [componentsPath + '/recordingcreator/recordingcreator'], returnFirstDependency);
@@ -803,9 +803,9 @@ var AppInfo = {};
         define('itemIdentifier', [componentsPath + '/itemidentifier/itemidentifier'], returnFirstDependency);
         define('itemMediaInfo', [componentsPath + '/itemMediaInfo/itemMediaInfo'], returnFirstDependency);
         define('mediaInfo', [componentsPath + '/mediainfo/mediainfo'], returnFirstDependency);
-        define('itemContextMenu', [componentsPath + '/itemcontextmenu'], returnFirstDependency);
+        define('itemContextMenu', [componentsPath + '/itemContextMenu'], returnFirstDependency);
         define('imageEditor', [componentsPath + '/imageeditor/imageeditor'], returnFirstDependency);
-        define('imageDownloader', [componentsPath + '/imagedownloader/imagedownloader'], returnFirstDependency);
+        define('imageDownloader', [componentsPath + '/imageDownloader/imageDownloader'], returnFirstDependency);
         define('dom', [scriptsPath + '/dom'], returnFirstDependency);
         define('playerStats', [componentsPath + '/playerstats/playerstats'], returnFirstDependency);
         define('searchFields', [componentsPath + '/search/searchfields'], returnFirstDependency);
@@ -813,9 +813,9 @@ var AppInfo = {};
         define('upNextDialog', [componentsPath + '/upnextdialog/upnextdialog'], returnFirstDependency);
         define('subtitleAppearanceHelper', [componentsPath + '/subtitlesettings/subtitleappearancehelper'], returnFirstDependency);
         define('subtitleSettings', [componentsPath + '/subtitlesettings/subtitlesettings'], returnFirstDependency);
-        define('displaySettings', [componentsPath + '/displaysettings/displaysettings'], returnFirstDependency);
+        define('displaySettings', [componentsPath + '/displaySettings/displaySettings'], returnFirstDependency);
-        define('playbackSettings', [componentsPath + '/playbacksettings/playbacksettings'], returnFirstDependency);
+        define('playbackSettings', [componentsPath + '/playbackSettings/playbackSettings'], returnFirstDependency);
-        define('homescreenSettings', [componentsPath + '/homescreensettings/homescreensettings'], returnFirstDependency);
+        define('homescreenSettings', [componentsPath + '/homeScreenSettings/homeScreenSettings'], returnFirstDependency);
         define('playbackManager', [componentsPath + '/playback/playbackmanager'], getPlaybackManager);
         define('layoutManager', [componentsPath + '/layoutManager', 'apphost'], getLayoutManager);
         define('homeSections', [componentsPath + '/homesections/homesections'], returnFirstDependency);
@@ -826,10 +826,10 @@ var AppInfo = {};
         define('cardBuilder', [componentsPath + '/cardbuilder/cardBuilder'], returnFirstDependency);
         define('peoplecardbuilder', [componentsPath + '/cardbuilder/peoplecardbuilder'], returnFirstDependency);
         define('chaptercardbuilder', [componentsPath + '/cardbuilder/chaptercardbuilder'], returnFirstDependency);
-        define('deleteHelper', [componentsPath + '/deletehelper'], returnFirstDependency);
+        define('deleteHelper', [componentsPath + '/deleteHelper'], returnFirstDependency);
         define('tvguide', [componentsPath + '/guide/guide'], returnFirstDependency);
         define('guide-settings-dialog', [componentsPath + '/guide/guide-settings'], returnFirstDependency);
-        define('loadingDialog', [componentsPath + '/loadingdialog/loadingdialog'], returnFirstDependency);
+        define('loadingDialog', [componentsPath + '/loadingDialog/loadingDialog'], returnFirstDependency);
         define('viewManager', [componentsPath + '/viewManager/viewManager'], function (viewManager) {
             window.ViewManager = viewManager;
             viewManager.dispatchPageEvents(true);
@@ -843,18 +843,17 @@ var AppInfo = {};
         define('viewSettings', [componentsPath + '/viewsettings/viewsettings'], returnFirstDependency);
         define('filterMenu', [componentsPath + '/filtermenu/filtermenu'], returnFirstDependency);
         define('sortMenu', [componentsPath + '/sortmenu/sortmenu'], returnFirstDependency);
-        define('idb', [componentsPath + '/idb'], returnFirstDependency);
+        define('sanitizefilename', [componentsPath + '/sanitizeFilename'], returnFirstDependency);
-        define('sanitizefilename', [componentsPath + '/sanitizefilename'], returnFirstDependency);
         define('toast', [componentsPath + '/toast/toast'], returnFirstDependency);
-        define('scrollHelper', [componentsPath + '/scrollhelper'], returnFirstDependency);
+        define('scrollHelper', [componentsPath + '/scrollHelper'], returnFirstDependency);
-        define('touchHelper', [componentsPath + '/touchhelper'], returnFirstDependency);
+        define('touchHelper', [scriptsPath + '/touchHelper'], returnFirstDependency);
-        define('imageUploader', [componentsPath + '/imageuploader/imageuploader'], returnFirstDependency);
+        define('imageUploader', [componentsPath + '/imageUploader/imageUploader'], returnFirstDependency);
         define('htmlMediaHelper', [componentsPath + '/htmlMediaHelper'], returnFirstDependency);
         define('viewContainer', [componentsPath + '/viewContainer'], returnFirstDependency);
         define('dialogHelper', [componentsPath + '/dialogHelper/dialogHelper'], returnFirstDependency);
-        define('serverNotifications', [componentsPath + '/serverNotifications'], returnFirstDependency);
+        define('serverNotifications', [scriptsPath + '/serverNotifications'], returnFirstDependency);
         define('skinManager', [componentsPath + '/skinManager'], returnFirstDependency);
-        define('keyboardnavigation', [scriptsPath + '/keyboardnavigation'], returnFirstDependency);
+        define('keyboardnavigation', [scriptsPath + '/keyboardNavigation'], returnFirstDependency);
         define('mouseManager', [scriptsPath + '/mouseManager'], returnFirstDependency);
         define('scrollManager', [componentsPath + '/scrollManager'], returnFirstDependency);
         define('autoFocuser', [componentsPath + '/autoFocuser'], returnFirstDependency);