Skip to content

Commit 6a9a826

Browse files
author
Dean Hudson
committedSep 27, 2014
Add classic call in SearchResults
1 parent cb3ed8a commit 6a9a826

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed
 

‎build/js/oa-all.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -40687,9 +40687,9 @@ function ParticleCollection(t){this._data=_.map(t,function(t){return Object.free
4068740687
function Search(e){this._data=Object.freeze({results:new SearchResults(e)})}var $=require("jquery"),_=require("underscore"),util=require("./util"),api=require("./api"),prop=util.getProperty,SearchResults=require("./searchResult"),ArtistInfo=require("./artistInfo"),Classic=require("./classic"),Aura=require("./aura");Search.prototype={},Search.api=function(){return api},Search.find=function(e,t){return api.searchRequest("artists",{q:e},function(r,a){t(new SearchResults(a,e))})},Search.exactInfo=function(e,t){return api.searchRequest("artists",{q:e},function(r,a){var s=new SearchResults(a,e);ArtistInfo.fetchByOaArtistId(s.exactMatch().oaArtistId(),t)})},Search.exactClassic=function(e,t){return api.searchRequest("artists",{q:e},function(r,a){var s=new SearchResults(a,e);Classic.fetchByOaArtistId(s.exactMatch().oaArtistId(),t)})},Search.matchAlias=function(e,t,r){return api.searchRequest("artists",{q:e},function(a,s){var i=new SearchResults(s,e);ArtistInfo.fetchByOaArtistId(i.matchNameQualifier(t).oaArtistId(),r)})},Search.exactParticles=function(e,t){return api.searchRequest("artists",{q:e},function(r,a){var s=new SearchResults(a,e);Aura.fetchByOaArtistId(s.exactMatch().oaArtistId(),t)})},module.exports=Search;
4068840688

4068940689
},{"./api":260,"./artistInfo":261,"./aura":262,"./classic":263,"./searchResult":270,"./util":272,"jquery":51,"underscore":258}],270:[function(require,module,exports){
40690-
function Result(t){this._data=Object.freeze({oaArtistId:prop(t,"oa_artist_id"),name:prop(t,"name"),nameQualifier:prop(t,"name_qualifier"),musicbrainzGid:prop(t,"musicbrainz_gid")})}function SearchResults(t,r){this._data=Object.freeze({reqString:r,results:_.map(t,function(t){return new Result(t)})})}var $=require("jquery"),_=require("underscore"),util=require("./util"),prop=util.getProperty,ArtistInfo=require("./artistInfo"),Aura=require("./aura");Result.prototype={artistInfo:function(t){ArtistInfo.fetchByOaArtistId(this._data.oaArtistId,t)},particles:function(t){Aura.fetchByOaArtistId(this._data.oaArtistId,t)},oaArtistId:function(){return this._data.oaArtistId},name:function(){return this._data.name},nameQualifier:function(){return this._data.nameQualifer},musicbrainzGid:function(){return this._data.musicbrainzGid},asObject:function(){return{oa_artist_id:this.oaArtistId(),name:this.name(),name_qualifier:this.nameQualifier(),musicbrainz_gid:this.musicbrainzGid()}}},SearchResults.prototype={reqString:function(){return this._data.reqString},results:function(){return this._data.results},each:function(t){_.each(this._data,t)},filter:function(t){return new SearchResults(_.chain(this._data.results).filter(t).map(function(t){return t.asObject()}).value())},map:function(t){return _.map(this._data,t)},exactMatch:function(){var t=this;return _.find(this.results(),function(r){return r.name()==t.reqString()})},matchNameQualifier:function(){return _.find(this.results(),function(t){return/q/.test(t.nameQualifier())})},asObject:function(){return{req_string:this.reqString(),results:_.map(this.results(),function(t){return t.asObject()})}}},module.exports=SearchResults;
40690+
function Result(t){this._data=Object.freeze({oaArtistId:prop(t,"oa_artist_id"),name:prop(t,"name"),nameQualifier:prop(t,"name_qualifier"),musicbrainzGid:prop(t,"musicbrainz_gid")})}function SearchResults(t,r){this._data=Object.freeze({reqString:r,results:_.map(t,function(t){return new Result(t)})})}var $=require("jquery"),_=require("underscore"),util=require("./util"),prop=util.getProperty,ArtistInfo=require("./artistInfo"),Classic=require("./classic"),Aura=require("./aura");Result.prototype={artistInfo:function(t){ArtistInfo.fetchByOaArtistId(this._data.oaArtistId,t)},particles:function(t){Aura.fetchByOaArtistId(this._data.oaArtistId,t)},classic:function(t){Classic.fetchByOaArtistId(this._data.oaArtistId,t)},oaArtistId:function(){return this._data.oaArtistId},name:function(){return this._data.name},nameQualifier:function(){return this._data.nameQualifer},musicbrainzGid:function(){return this._data.musicbrainzGid},asObject:function(){return{oa_artist_id:this.oaArtistId(),name:this.name(),name_qualifier:this.nameQualifier(),musicbrainz_gid:this.musicbrainzGid()}}},SearchResults.prototype={reqString:function(){return this._data.reqString},results:function(){return this._data.results},each:function(t){_.each(this._data,t)},filter:function(t){return new SearchResults(_.chain(this._data.results).filter(t).map(function(t){return t.asObject()}).value())},map:function(t){return _.map(this._data,t)},exactMatch:function(){var t=this;return _.find(this.results(),function(r){return r.name()==t.reqString()})},matchNameQualifier:function(){return _.find(this.results(),function(t){return/q/.test(t.nameQualifier())})},asObject:function(){return{req_string:this.reqString(),results:_.map(this.results(),function(t){return t.asObject()})}}},module.exports=SearchResults;
4069140691

40692-
},{"./artistInfo":261,"./aura":262,"./util":272,"jquery":51,"underscore":258}],271:[function(require,module,exports){
40692+
},{"./artistInfo":261,"./aura":262,"./classic":263,"./util":272,"jquery":51,"underscore":258}],271:[function(require,module,exports){
4069340693
function Source(t){this._data=Object.freeze({id:prop(t,"source_id"),handle:prop(t,"handle"),uid:prop(t,"uid"),providerId:prop(t,"provider_id"),providerName:prop(t,"provider_name"),providerUrl:prop(t,"provider_url"),totalParticles:prop(t,"particle_stats.particle_count")||prop(t,"total_particles"),textParticleCount:prop(t,"particle_stats.text_count")||prop(t,"text_particle_count"),imageParticleCount:prop(t,"particle_stats.image_count")||prop(t,"image_particle_count"),videoParticleCount:prop(t,"particle_stats.video_count")||prop(t,"video_particle_count")})}var util=require("./util"),prop=util.getProperty,api=require("./api");Source.prototype={id:function(){return this._data.id},name:function(){return this._data.name},uid:function(){return this._data.uid},handle:function(){return this._data.handle},providerId:function(){return this._data.providerId},providerName:function(){return this._data.providerName},providerUrl:function(){return this._data.providerUrl},totalParticles:function(){return this._data.totalParticles},textParticleCount:function(){return this._data.textParticleCount},imageParticleCount:function(){return this._data.imageParticleCount},videoParticleCount:function(){return this._data.videoParticleCount},asObject:function(){return{id:this.id(),name:this.name(),uid:this.uid(),handle:this.handle(),provider_id:this.providerId(),provider_name:this.providerName(),provider_url:this.providerUrl(),total_particles:this.totalParticles(),text_particle_count:this.textParticleCount(),image_particle_count:this.imageParticleCount(),video_particle_count:this.videoParticleCount()}}},Source.api=function(){return api},Source.fetchByAnchorId=function(t,r){return api.infoRequest("sources/"+t,{id_type:"oa:source_id"},function(t,i){r(new Source(i))})},module.exports=Source;
4069440694

4069540695
},{"./api":260,"./util":272}],272:[function(require,module,exports){

‎src/js/searchResult.js

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var $ = require('jquery'),
66
util = require('./util'),
77
prop = util.getProperty,
88
ArtistInfo = require('./artistInfo'),
9+
Classic = require('./classic'),
910
Aura = require('./aura');
1011

1112
function Result(data) {
@@ -26,6 +27,10 @@ Result.prototype = {
2627
Aura.fetchByOaArtistId(this._data.oaArtistId, cb);
2728
},
2829

30+
classic: function (cb) {
31+
Classic.fetchByOaArtistId(this._data.oaArtistId, cb);
32+
},
33+
2934
oaArtistId: function () { return this._data.oaArtistId; },
3035
name: function () { return this._data.name; },
3136
nameQualifier: function () { return this._data.nameQualifer; },

0 commit comments

Comments
 (0)