Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-24 10:37:16 +00:00
Code Issues Projects Releases Wiki Activity

Trigger close event on Winamp object

Browse source 
Fixes exiting Winamp from context menu

Fixes #147
This commit is contained in:
Jordan Eldredge 2015-04-13 19:37:15 -07:00
parent 6f6f05a0e3
commit f0a8c7a2b3
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/main-window.js
View file

@ -56,7 +56,7 @@ return {
var self = this;
this.nodes.close.onclick = function() {
self.close();
self.winamp.close();
};
this.nodes.shade.onclick = function() {
@ -202,6 +202,7 @@ return {
window.addEventListener('doubledModeToggled', function() { self.toggleDoubledMode(); });
window.addEventListener('repeatToggled', function() { self.toggleRepeat(); });
window.addEventListener('llamaToggled', function() { self.toggleLlama(); });
window.addEventListener('close', function() { self.close(); });
this.nodes.window.addEventListener('dragenter', this.dragenter.bind(this));
this.nodes.window.addEventListener('dragover', this.dragover.bind(this));
@ -214,8 +215,6 @@ return {
},
close: function() {
// Probably not the right thing once we have more windows
this.winamp.close();
this.nodes.window.classList.add('closed');
},

4
js/winamp.js
View file

@ -39,7 +39,8 @@ return {
balanceChanged: new Event('balanceChanged'),
doubledModeToggled: new Event('doubledModeToggled'),
repeatToggled: new Event('repeatToggled'),
llamaToggled: new Event('llamaToggled')
llamaToggled: new Event('llamaToggled'),
close: new Event('close')
};
this.setVolume(options.volume);
@ -210,6 +211,7 @@ return {
},
close: function() {
window.dispatchEvent(this.events.close);
this.media.stop();
this.setState('stop'); // Currently unneeded
},