Mirroring/kaamelott-soundboard
1
0
Fork 0
mirror of https://github.com/2ec0b4/kaamelott-soundboard.git synced 2025-12-08 15:43:24 +00:00
Code Releases Activity

Finalise le filtre des sons

Browse Source
This commit is contained in:
Antoine
2016-04-12 22:42:50 +02:00
parent 2bc2196562
commit fda6b1fa36
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/app/collections/sounds.js
View File

@@ -16,7 +16,7 @@ define(
return this;
}
var pattern = new RegExp('^'+search, 'gi');
var pattern = new RegExp(search, 'gi');
return new Sounds(this.filter(function(data) {
return pattern.test(data.get('title'));
}));

31
js/app/views/sounds.js
View File

@@ -20,22 +20,24 @@ define(
initialize: function() {
var that = this;
this.data = {};
this.data = {
collection: this.collection
};
this.channel = Radio.channel('Sounds');
this.channel.request('getSounds')
.then(function(sounds) {
that.collection = new SoundsCollection(sounds);
that.data.sounds = that.collection.toJSON();
this.channel.request('getSounds').then(this.initCollection.bind(this));
this.channel.on('sounds:filter', this.filterCollection.bind(this));
},
initCollection: function(sounds) {
this.data.collection = new SoundsCollection(sounds);
this.collection = this.data.collection;
that.render();
});
this.render();
},
filterCollection: function(search) {
this.collection = this.data.collection.filterByTitle(search);
this.channel.on('sounds:filter', function(search) {
that.data.sounds = that.collection.filterByTitle(search).toJSON();
that.render();
});
this.render();
},
stopPlayingSound: function() {
var playingSound = this.collection.findWhere({playing: true});
@@ -43,11 +45,6 @@ define(
if( playingSound ) {
playingSound.stop();
}
},
serializeData: function () {
var viewData = {data: this.data};
return _.extend(viewData, Marionette.CollectionView.prototype.serializeData.apply(this, arguments));
}
});