Zach's git repos / prosongsa
Backend for songs.zachdecook.com
* Enable ukulele chords to appear (when they exist)
Browse Source
Zach DeCook 2018-03-22
parent bae7f42 · commit f4f9ef1
Diffstat
-rwxr-xr-xindex.php4
-rw-r--r--jsonly.js38
2 files changed, 22 insertions, 20 deletions
diff --git a/index.php b/index.php
index fa6f856..e26d124 100755
--- a/index.php
+++ b/index.php
@@ -55,7 +55,8 @@ Author: Zach DeCook
<div class = "col-xs-6 col-xs-offset-0 ">
<div id="chordarea">
- <canvas id='chordy' width="100" height="100"/>
+ <canvas id='guitarregion' width="100" height="100"></canvas>
+ <canvas id='ukuleleregion' width="100" height="100"></canvas>
</div>
<i>Experimental: Click on a chord to view guitar tablature</i>
<div id="messages"></div>
@@ -128,5 +129,6 @@ crossorigin="anonymous"></script>
<script type="text/javascript" src="jsonly.js"></script>
<script type="text/javascript" src="ccharter/scripts/ccharter.js"></script>
<script type="text/javascript" src="chordsdata/chords.js"></script>
+<script type="text/javascript" src="chordsdata/ukulelechords.js"></script>
</body>
</html>
diff --git a/jsonly.js b/jsonly.js
index 4f19ecd..68cd63d 100644
--- a/jsonly.js
+++ b/jsonly.js
@@ -69,18 +69,14 @@ $(".tabs").click(function(e) {
function show_tab( chord )
{
- var canvas = $("#chordy")[0];
+ var canvas = $("#guitarregion")[0];
+ var context = canvas.getContext('2d');
+ context.clearRect(0, 0, canvas.width, canvas.height);
+ var canvas = $("#ukuleleregion")[0];
var context = canvas.getContext('2d');
context.clearRect(0, 0, canvas.width, canvas.height);
getChordFrets(chord);
-
-/*
- var img = "<img class='myimage' src='chordimages/" + chord + ".png'/>";
- $("#chordarea").append(img);
- $(".myimage").error(function(){
- $(this).hide();
- });*/
}
function getChordFrets(chord)
@@ -91,7 +87,7 @@ function getChordFrets(chord)
chord = chord.replace("sus", "s");
chord = chord.replace("s4", "s");
chord = chord.replace("s", "sus");
- chord = chord.replace("7sus", "sus7");
+ chord = chord.replace("7sus", "sus7");
chord = chord.replace("mj7", "maj7");
var chordd = chord;
chordd = chordd.replace("Db", "C#");
@@ -99,15 +95,19 @@ function getChordFrets(chord)
chordd = chordd.replace("Gb", "F#");
chordd = chordd.replace("Ab", "G#");
chordd = chordd.replace("Bb", "A#");
- taco = chordsDict[chordd][0];
- if ( taco ) {
- ChordCharter.drawChord("chordy", 30, 25, chord, taco);
- } else {
- //Cross-origin stuff
- /*var url = "http://jguitar.com/chordsearch?chordsearch="+chord+"&labels=none&fretSpan=4";
- $.get(url, function(data, status){
- $("#messages").prepend("something something gotten");
- });*/
- $("#messages").prepend("Couldn't find a chord for '"+ chord +"'");
+
+ try{
+ guitarTab = chordsDict[chordd][0];
+ ChordCharter.drawChord( "guitarregion", 30, 25, chord, guitarTab );
+ }
+ catch(target){
+ $("#messages").prepend("No guitar tab for '" + chord + "'");
+ }
+ try{
+ ukuleleTab = ukulelechordsDict[chordd][0];
+ ChordCharter.drawChord( "ukuleleregion", 30, 25, chord, ukuleleTab );
+ }
+ catch(target){
+ $("#messages").prepend("No ukulele tab for '" + chord + "'");
}
}