Merge branch 'master' into migrate-to-ES6-47

src/controllers/livetv/livetvchannels.js

@@ -2,6 +2,7 @@ define(['cardBuilder', 'imageLoader', 'libraryBrowser', 'loading', 'events', 'us
     'use strict';
 
     loading = loading.default || loading;
+    libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {
         function getPageData() {

src/controllers/movies/moviecollections.js

@@ -2,6 +2,7 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
     'use strict';
 
     loading = loading.default || loading;
+    libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {
         function getPageData(context) {

src/controllers/movies/moviegenres.js

@@ -2,6 +2,7 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
     'use strict';
 
     loading = loading.default || loading;
+    libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {
         function getPageData() {

src/controllers/movies/movies.js

@@ -2,6 +2,7 @@ define(['loading', 'layoutManager', 'userSettings', 'events', 'libraryBrowser',
     'use strict';
 
     loading = loading.default || loading;
+    libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent, options) {
         function onViewStyleChange() {

src/controllers/movies/movietrailers.js

@@ -2,6 +2,7 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
     'use strict';
 
     loading = loading.default || loading;
+    libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {
         function getPageData(context) {

src/controllers/music/musicalbums.js

@@ -2,6 +2,7 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
     'use strict';
 
     loading = loading.default || loading;
+    libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {
         function playAll() {

src/controllers/music/musicartists.js

@@ -2,6 +2,7 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
     'use strict';
 
     loading = loading.default || loading;
+    libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {
         function getPageData(context) {

src/controllers/music/musicgenres.js

@@ -2,6 +2,7 @@ define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], f
     'use strict';
 
     loading = loading.default || loading;
+    libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {
         function getPageData() {

src/controllers/music/musicplaylists.js

@@ -2,6 +2,7 @@ define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], f
     'use strict';
 
     loading = loading.default || loading;
+    libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {
         function getPageData() {

src/controllers/music/songs.js

@@ -2,6 +2,7 @@ define(['events', 'libraryBrowser', 'imageLoader', 'listView', 'loading', 'userS
     'use strict';
 
     loading = loading.default || loading;
+    libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {
         function getPageData(context) {