diff --git a/web/app/assets/javascripts/dialog/openBackingTrackDialog.js b/web/app/assets/javascripts/dialog/openBackingTrackDialog.js index 7a950a829..b1297c2e1 100644 --- a/web/app/assets/javascripts/dialog/openBackingTrackDialog.js +++ b/web/app/assets/javascripts/dialog/openBackingTrackDialog.js @@ -28,11 +28,11 @@ resetPagination(); showing = true; getBackingTracks() - .done(function(data, textStatus, jqXHR) { - // initialize pagination - var $paginator = context.JK.Paginator.create(parseInt(jqXHR.getResponseHeader('total-entries')), perPage, 0, onPageSelected) - $paginatorHolder.append($paginator); - }); + // .done(function(data, textStatus, jqXHR) { + // // initialize pagination + // var $paginator = context.JK.Paginator.create(parseInt(jqXHR.getResponseHeader('total-entries')), perPage, 0, onPageSelected) + // $paginatorHolder.append($paginator); + // }); } function afterHide() { @@ -45,33 +45,25 @@ } function getBackingTracks(page) { - return rest.getBackingTracks({page:page + 1, per_page:10}) - .done(function(result) { - console.log("result: ", result) - var backingTracks = result.backing_tracks - console.log("Backing Tracks: ", backingTracks) - emptyList(); - $.each(backingTracks, function(index, backingTrack) { - console.log("Backing TRACK: ", backingTrack) - var options = { - backingTrackState: null, - path: backingTrack.path, - name: backingTrack.name, - length: backingTrack.length ? backingTrack.length : 0 - } - console.log("options: ", options) - var $tr = $(context._.template($templateOpenBackingTrackRow.html(), options, { variable: 'data' })); - console.log("foo") - $tr.data('server-model', backingTrack); - console.log("bar") - console.log("Appending TR:") - $tbody.append($tr); - }); - }) - .fail(function(jqXHR, textStatus, errorMessage) { - app.ajaxError(jqXHR, textStatus, errorMessage); + var backingTracks = context.jamClient.getBackingTrackList(); + console.log("Backing Tracks: ", backingTracks) + + if (typeof(backingTracks)=="undefined") { + $tbody.append("No Tracks found"); + } else { + $.each(backingTracks, function(index, backingTrack) { + var options = { + backingTrackState: null, + path: backingTrack.path, + name: backingTrack.name + //length: backingTrack.length ? backingTrack.length : 0 + } + var $tr = $(context._.template($templateOpenBackingTrackRow.html(), options, { variable: 'data' })); + $tr.data('server-model', backingTrack); + $tbody.append($tr); }); + }//end } diff --git a/web/app/assets/javascripts/fakeJamClient.js b/web/app/assets/javascripts/fakeJamClient.js index 1a42a27b5..9d64bd256 100644 --- a/web/app/assets/javascripts/fakeJamClient.js +++ b/web/app/assets/javascripts/fakeJamClient.js @@ -784,6 +784,14 @@ fire(); } + + function getBackingTrackList() { + return [ + {name:'foo',path:"foobar.mp3", length:4283}, + {name:'bar',path:"foo.mp3",length:3257} + ]; + } + function ClientUpdateStartUpdate(path, successCallback, failureCallback) {} // ------------------------------- @@ -1044,6 +1052,7 @@ this.GetScoreWorkTimingInterval = GetScoreWorkTimingInterval; this.SetScoreWorkTimingInterval = SetScoreWorkTimingInterval; + this.getBackingTrackList = getBackingTrackList; this.SessionCloseBackingTrackFile = SessionCloseBackingTrackFile; this.SessionOpenBackingTrackFile = SessionOpenBackingTrackFile; diff --git a/web/app/views/dialogs/_openBackingTrackDialog.html.slim b/web/app/views/dialogs/_openBackingTrackDialog.html.slim index dec11d179..e3aee9d97 100644 --- a/web/app/views/dialogs/_openBackingTrackDialog.html.slim +++ b/web/app/views/dialogs/_openBackingTrackDialog.html.slim @@ -20,7 +20,7 @@ tbody br - .left.paginator-holder + / .left.paginator-holder .help-links a.what-are-backingtracks href='#'