module resolution for loading, page and playerSelectionMenu

src/components/appRouter.js

@@ -1,4 +1,4 @@
-define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinManager', 'pluginManager', 'backdrop', 'browser', 'pageJs', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, layoutManager, skinManager, pluginManager, backdrop, browser, page, appSettings, appHost, connectionManager) {
+define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinManager', 'pluginManager', 'backdrop', 'browser', 'page', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, layoutManager, skinManager, pluginManager, backdrop, browser, page, appSettings, appHost, connectionManager) {
     'use strict';
 
     var appRouter = {

src/components/loading/loading.js

@@ -1,6 +1,10 @@
-define(['css!./loading-lite'], function () {
+define(['components/loading/loadingLegacy', 'browser', 'css!./loading'], function (loadingLegacy, browser) {
     'use strict';
 
+    if (browser.tizen || browser.operaTv || browser.chromecast || browser.orsay || browser.web0s || browser.ps4) {
+        return loadingLegacy;
+    }
+
     var loadingElem;
     var layer1;
     var layer2;

src/components/loading/loadingLegacy.js

@@ -1,4 +1,4 @@
-define(['require', 'css!./loading-legacy'], function (require) {
+define(['require', 'css!./loadingLegacy'], function (require) {
     'use strict';
 
     var loadingElem;

src/components/loading/package.json

@@ -0,0 +1,3 @@
+{
+    "main": "loading.js"
+}

src/components/navdrawer/package.json

@@ -0,0 +1,3 @@
+{
+    "main": "navdrawer.js"
+}

src/scripts/site.js

@@ -445,12 +445,7 @@ var AppInfo = {};
             define("prompt", [componentsPath + "/prompt/prompt"], returnFirstDependency);
         }
 
-        if (browser.tizen || browser.operaTv || browser.chromecast || browser.orsay || browser.web0s || browser.ps4) {
-            define("loading", [componentsPath + "/loading/loading-legacy"], returnFirstDependency);
-        } else {
-            define("loading", [componentsPath + "/loading/loading-lite"], returnFirstDependency);
-        }
-
+        define("loading", [componentsPath + "/loading/loading"], returnFirstDependency);
         define("multi-download", [componentsPath + "/multidownload"], returnFirstDependency);
         define("fileDownloader", [componentsPath + "/filedownloader"], returnFirstDependency);
         define("localassetmanager", [apiClientBowerPath + "/localassetmanager"], returnFirstDependency);
@@ -701,7 +696,7 @@ var AppInfo = {};
             inputManager: componentsPath + "/inputmanager",
             qualityoptions: componentsPath + "/qualityoptions",
             hammer: bowerPath + "/hammerjs/hammer.min",
-            pageJs: "thirdparty/pagejs/page",
+            page: "thirdparty/page",
             focusManager: componentsPath + "/focusmanager",
             datetime: componentsPath + "/datetime",
             globalize: componentsPath + "/globalize",
@@ -727,7 +722,7 @@ var AppInfo = {};
         define("directorybrowser", ["components/directorybrowser/directorybrowser"], returnFirstDependency);
         define("metadataEditor", [componentsPath + "/metadataeditor/metadataeditor"], returnFirstDependency);
         define("personEditor", [componentsPath + "/metadataeditor/personeditor"], returnFirstDependency);
-        define("playerSelectionMenu", [componentsPath + "/playback/playerselection"], 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);