merge from dev
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
|
||||
query.UserId = Dashboard.getCurrentUserId();
|
||||
|
||||
ApiClient.getJSON(ApiClient.getUrl("Channels", query)).done(function (result) {
|
||||
ApiClient.getJSON(ApiClient.getUrl("Channels", query)).then(function (result) {
|
||||
|
||||
// Scroll back up so they can see the results from the beginning
|
||||
window.scrollTo(0, 0);
|
||||
@@ -70,7 +70,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
$(document).on('pageinit', "#channelsPage", function () {
|
||||
pageIdOn.on('pageinit', "channelsPage", function () {
|
||||
|
||||
var page = this;
|
||||
|
||||
@@ -79,8 +79,8 @@
|
||||
|
||||
LibraryBrowser.configurePaperLibraryTabs(page, tabs, pages, 'channels.html');
|
||||
|
||||
$(pages).on('tabchange', function () {
|
||||
loadTab(page, parseInt(this.selected));
|
||||
pages.addEventListener('tabchange', function (e) {
|
||||
loadTab(page, parseInt(e.target.selected));
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user