Skip to content

Commit

Permalink
#16 underline current track in list
Browse files Browse the repository at this point in the history
  • Loading branch information
@bobbyrne01
bobbyrne01 committed Jan 31, 2015
1 parent 1832ca8 commit 8a9086a
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 36 deletions.
3 changes: 2 additions & 1 deletion Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ module.exports = function (grunt) {
validation: {
options: {
stoponerror: false,
reset: true
reset: true,
relaxerror: ['Empty heading.']
},
files: {
src: ['addon/data/html/*.html']
Expand Down
48 changes: 37 additions & 11 deletions addon/data/js/controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ var LocalMusicPlayer = {
LocalMusicPlayer.play(
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].cells[0].innerHTML,
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].cells[1].innerHTML);

LocalMusicPlayer.resetUnderline();
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].style.textDecoration = 'underline';
}
}
}
Expand Down Expand Up @@ -77,13 +80,13 @@ var LocalMusicPlayer = {
self.port.emit("selectDir", '');
},
play: function (dir, filename) {

if (document.getElementById('tracks').rows[0]) {
document.getElementById('player').src = 'file://' + dir + LocalMusicPlayer.separator + filename;
document.getElementById('player').play();

document.getElementById('currentTrack').textContent = filename;

if (document.getElementById('notificationPref').checked) {
self.port.emit("play", filename); // for notification
}
Expand All @@ -97,6 +100,7 @@ var LocalMusicPlayer = {
document.getElementById('currentTrack').textContent = '';
LocalMusicPlayer.currentSongRow = null;
document.getElementById('player').src = '';
LocalMusicPlayer.resetUnderline();
}
},
prevTrack: function () {
Expand All @@ -105,6 +109,9 @@ var LocalMusicPlayer = {
LocalMusicPlayer.play(
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].cells[0].innerHTML,
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].cells[1].innerHTML);

LocalMusicPlayer.resetUnderline();
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].style.textDecoration = 'underline';
}
},
nextTrack: function () {
Expand All @@ -122,6 +129,9 @@ var LocalMusicPlayer = {
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].cells[0].innerHTML,
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].cells[1].innerHTML);

LocalMusicPlayer.resetUnderline();
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].style.textDecoration = 'underline';

} else {

if (document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow] !== undefined) {
Expand All @@ -130,6 +140,9 @@ var LocalMusicPlayer = {
LocalMusicPlayer.play(
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].cells[0].innerHTML,
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].cells[1].innerHTML);

LocalMusicPlayer.resetUnderline();
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].style.textDecoration = 'underline';
}
}
}
Expand All @@ -151,6 +164,9 @@ var LocalMusicPlayer = {
LocalMusicPlayer.play(
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].cells[0].innerHTML,
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].cells[1].innerHTML);

LocalMusicPlayer.resetUnderline();
document.getElementById('tracks').rows[LocalMusicPlayer.currentSongRow].style.textDecoration = 'underline';
}
}
},
Expand Down Expand Up @@ -233,10 +249,20 @@ var LocalMusicPlayer = {
LocalMusicPlayer.currentSongRow = iteration;
LocalMusicPlayer.play(song.dir, song.filename);

LocalMusicPlayer.resetUnderline();
document.getElementById('tracks').rows[iteration].style.textDecoration = 'underline';

}, false);

cell2.appendChild(img);
},
resetUnderline: function () {

for (var j = 0; j < document.getElementById('tracks').rows.length; j++) {

document.getElementById('tracks').rows[j].style.textDecoration = '';
}
},
toggleView: function (obj) {
if (obj.id === 'libraryShow') {

Expand Down Expand Up @@ -392,33 +418,33 @@ self.port.on('prevTrack', function () {
});

self.port.on('hotkeyPlayStatus', function (value) {
if (value === true){
if (value === true) {
document.getElementById('hotkeyPlayPref').className = 'green';
}else{
} else {
document.getElementById('hotkeyPlayPref').className = 'red';
}
});

self.port.on('hotkeyStopStatus', function (value) {
if (value === true){
if (value === true) {
document.getElementById('hotkeyStopPref').className = 'green';
}else{
} else {
document.getElementById('hotkeyStopPref').className = 'red';
}
});

self.port.on('hotkeyNextStatus', function (value) {
if (value === true){
if (value === true) {
document.getElementById('hotkeyNextPref').className = 'green';
}else{
} else {
document.getElementById('hotkeyNextPref').className = 'red';
}
});

self.port.on('hotkeyPrevStatus', function (value) {
if (value === true){
if (value === true) {
document.getElementById('hotkeyPrevPref').className = 'green';
}else{
} else {
document.getElementById('hotkeyPrevPref').className = 'red';
}
});
40 changes: 20 additions & 20 deletions addon/lib/Hotkey.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,77 +40,77 @@ exports.init = function () {
};

exports.reinitPlay = function () {

var status = true;
try{

try {
hotkeyPlay.destroy();
hotkeyPlay = Hotkey({
combo: Preference.get("hotkeyPlay"),
onPress: function () {
Panel.get().port.emit('playTrack', '');
}
});
}catch(err){
} catch (err) {
status = false;
}

return status;
};

exports.reinitStop = function () {

var status = true;
try{

try {
hotkeyStop.destroy();
hotkeyStop = Hotkey({
combo: Preference.get("hotkeyStop"),
onPress: function () {
Panel.get().port.emit('stopTrack', '');
}
});
}catch(err){
} catch (err) {
status = false;
}

return status;
};

exports.reinitNext = function () {

var status = true;
try{

try {
hotkeyNext.destroy();
hotkeyNext = Hotkey({
combo: Preference.get("hotkeyNext"),
onPress: function () {
Panel.get().port.emit('nextTrack', '');
}
});
}catch(err){
} catch (err) {
status = false;
}

return status;
};

exports.reinitPrev = function () {

var status = true;
try{

try {
hotkeyPrev.destroy();
hotkeyPrev = Hotkey({
combo: Preference.get("hotkeyPrev"),
onPress: function () {
Panel.get().port.emit('prevTrack', '');
}
});
}catch(err){
} catch (err) {
status = false;
}

return status;
};
8 changes: 4 additions & 4 deletions addon/lib/Panel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,22 @@ exports.init = function () {
panel.port.on("recursiveSetting", function (value) {
Preference.set('recursive', value);
});

panel.port.on("updateHotkeyPlay", function (value) {
Preference.set('hotkeyPlay', value);
panel.port.emit("hotkeyPlayStatus", Hotkey.reinitPlay());
});

panel.port.on("updateHotkeyStop", function (value) {
Preference.set('hotkeyStop', value);
panel.port.emit("hotkeyStopStatus", Hotkey.reinitStop());
});

panel.port.on("updateHotkeyNext", function (value) {
Preference.set('hotkeyNext', value);
panel.port.emit("hotkeyNextStatus", Hotkey.reinitNext());
});

panel.port.on("updateHotkeyPrev", function (value) {
Preference.set('hotkeyPrev', value);
panel.port.emit("hotkeyPrevStatus", Hotkey.reinitPrev());
Expand Down

0 comments on commit 8a9086a

Please sign in to comment.