merge from dev

dashboard-ui/scripts/playlists.js

@@ -52,10 +52,10 @@
         var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query);
         var promise2 = Dashboard.getCurrentUser();
 
-        $.when(promise1, promise2).done(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            var result = response1[0];
-            var user = response2[0];
+            var result = responses[0];
+            var user = responses[1];
 
             // Scroll back up so they can see the results from the beginning
             window.scrollTo(0, 0);
@@ -162,7 +162,7 @@
         });
     }
 
-    $(document).on('pagebeforeshow', "#playlistsPage", function () {
+    pageIdOn('pagebeforeshow', "playlistsPage", function () {
 
         var page = this;
         reloadItems(page);