mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Expect javascript resolvers to return "tracks" instead of "results"

Browse Source
This commit is contained in:
Dominik Schmidt
2015-11-20 23:55:14 +01:00
parent 16946592b7
commit a589e4f688
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
data/js/tomahawk.js
View File

@@ -274,7 +274,7 @@ Tomahawk.Resolver = {
_adapter_resolve: function (params) {
return RSVP.Promise.resolve(this.resolve(params)).then(function (results) {
return {
'results': results
'tracks': results
};
});
},
@@ -282,7 +282,7 @@ Tomahawk.Resolver = {
_adapter_search: function (params) {
return RSVP.Promise.resolve(this.search(params)).then(function (results) {
return {
'results': results
'tracks': results
};
});
},
@@ -1558,7 +1558,7 @@ Tomahawk.Collection = {
_adapter_resolve: function (params) {
return RSVP.Promise.resolve(this.resolve(params)).then(function (results) {
return {
'results': results
'tracks': results
};
});
},
@@ -1568,17 +1568,14 @@ Tomahawk.Collection = {
return this._fuzzyIndexIdsToTracks(resultIds);
},
_adapter_search: function (params) {
return RSVP.Promise.resolve(this.search(params)).then(function (results) {
return {
'results': results
};
});
},
search: function (params) {
var resultIds = Tomahawk.searchFuzzyIndex(params.query);
return this._fuzzyIndexIdsToTracks(resultIds);
return this._fuzzyIndexIdsToTracks(resultIds).then(function(tracks) {
return {
tracks: tracks
};
});
},
tracks: function (params, where) {
@@ -1625,7 +1622,7 @@ Tomahawk.Collection = {
);
return t.execDeferredStatements();
}).then(function (results) {
return {results: results[0]};
return {tracks: results[0]};
});
},