From 82d5c6dcb232ddc28c17b776eea85df4b3d6fbaf Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sun, 5 Jun 2016 22:30:22 +0200 Subject: [PATCH] Make chords.js a bit more readable. --- openlp/plugins/remotes/html/js/chords.js | 30 +++++++++++++++--------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/openlp/plugins/remotes/html/js/chords.js b/openlp/plugins/remotes/html/js/chords.js index ac9428355..b1befccc2 100644 --- a/openlp/plugins/remotes/html/js/chords.js +++ b/openlp/plugins/remotes/html/js/chords.js @@ -39,11 +39,12 @@ function storeTransposeValue(songId,transposeValueToSet) { } function transposeChord(chord, transposeValue, notation) { - var chordSplit = chord.replace('♭', 'b').split(/[\/\(\)]/), transposedChord = '', note, notenumber, rest, currentChord, - notesSharp = notesSharpNotation[notation], - notesFlat = notesFlatNotation[notation], - notesPreferred = ['b','#','#','#','#','#','#','#','#','#','#','#']; - chordNotes = Array(); + var chordSplit = chord.replace('♭', 'b').split(/[\/\(\)]/); + var transposedChord = '', note, notenumber, rest, currentChord; + var notesSharp = notesSharpNotation[notation]; + var notesFlat = notesFlatNotation[notation]; + var notesPreferred = ['b','#','#','#','#','#','#','#','#','#','#','#']; + var chordNotes = Array(); for (i = 0; i <= chordSplit.length - 1; i++) { if (i > 0) { transposedChord += '/'; @@ -70,18 +71,25 @@ function transposeChord(chord, transposeValue, notation) { note = currentchord; rest = ""; } - notenumber = (notesSharp.indexOf(note) === -1?notesFlat.indexOf(note):notesSharp.indexOf(note)); + notenumber = (notesSharp.indexOf(note) === -1 ? notesFlat.indexOf(note) : notesSharp.indexOf(note)); notenumber -= parseInt(transposeValue); - while (notenumber > 11) {notenumber -= 12;} - while (notenumber < 0) {notenumber += 12;} + while (notenumber > 11) { + notenumber -= 12; + } + while (notenumber < 0) { + notenumber += 12; + } if (i === 0) { currentChord = notesPreferred[notenumber] === '#' ? notesSharp[notenumber] : notesFlat[notenumber]; lastChord = currentChord; - }else { + } else { currentChord = notesSharp.indexOf(lastChord) === -1 ? notesFlat[notenumber] : notesSharp[notenumber]; } - if(!(notesFlat.indexOf(note)===-1 && notesSharp.indexOf(note)===-1)) transposedChord += currentChord + rest; else transposedChord += note + rest; //note+rest; - //transposedChord += currentChord + rest; + if (!(notesFlat.indexOf(note) === -1 && notesSharp.indexOf(note) === -1)) { + transposedChord += currentChord + rest; + } else { + transposedChord += note + rest; + } } } return transposedChord;