Merge branch '1.1'

This commit is contained in:
An Phan 2015-12-30 11:35:13 +07:00
commit 83f0a7190f
3 changed files with 5 additions and 5 deletions

View file

@ -55,10 +55,10 @@
this.hideOverlay(); this.hideOverlay();
// Ask for user's notificatio permission. // Ask for user's notification permission.
this.requestNotifPermission(); this.requestNotifPermission();
// Let all other compoenents know we're ready. // Let all other components know we're ready.
this.$broadcast('koel:ready'); this.$broadcast('koel:ready');
}); });
}, },
@ -80,7 +80,7 @@
}, },
/** /**
* Play the prev song when user presses K. * Play the previous song when user presses K.
* *
* @param {Object} e The keydown event * @param {Object} e The keydown event
*/ */

View file

@ -13,7 +13,7 @@ export default {
// How about another song then? // How about another song then?
// //
// LITTLE WING // LITTLE WING
// -- by Jimi Fucking Hendrick // -- by Jimi Fucking Hendrix
// //
// Well she's walking // Well she's walking
// Through the clouds // Through the clouds

View file

@ -77,7 +77,7 @@ export default {
}, },
/** /**
* Get songs by their ID's * Get songs by their IDs
* *
* @param {Array} ids * @param {Array} ids
* *