From 2943b2bc419b9180884018fea053021a11c1bd2f Mon Sep 17 00:00:00 2001 From: Zach DeCook Date: Mon, 27 May 2019 10:29:20 -0400 Subject: * Move more files out of public/js --- laravel/public/js/ccharter | 1 - laravel/public/js/jsonly.js | 153 -------------------------------------------- laravel/public/js/page.js | 112 -------------------------------- 3 files changed, 266 deletions(-) delete mode 120000 laravel/public/js/ccharter delete mode 100644 laravel/public/js/jsonly.js delete mode 100644 laravel/public/js/page.js (limited to 'laravel/public/js') diff --git a/laravel/public/js/ccharter b/laravel/public/js/ccharter deleted file mode 120000 index 895021d..0000000 --- a/laravel/public/js/ccharter +++ /dev/null @@ -1 +0,0 @@ -../../../ccharter/scripts/ \ No newline at end of file diff --git a/laravel/public/js/jsonly.js b/laravel/public/js/jsonly.js deleted file mode 100644 index 4f5d6c8..0000000 --- a/laravel/public/js/jsonly.js +++ /dev/null @@ -1,153 +0,0 @@ -/** - * @brief jsonly.js contains the functions that are only called in js, - * not translated from server-side code. - */ - -$('#transp').change( do_transpose ); -var lastTransp = parseInt($('#transp').val()); - -var guitarObj = { - name: 'guitar', - dict: chordsDict, - region: 'guitarregion', - chord: '', - chordd: '', - number: 0, -} -var ukeObj = { - name: 'ukulele', - dict: ukulelechordsDict, - region: 'ukuleleregion', - chord: '', - chordd: '', - number: 0, -} - -function do_transpose() -{ - var transp = parseInt($('#transp').val()); - var neww = transp; - - $(".tabs").each(function(){ - // Since we only store text that is displayed, transpose relative to - // previous transposition. - // Requires the class to be "tabs chordXX"; - var old = parseInt($(this).attr('class').substring(10)); - if ( isNaN(old) ) - { - old = $(this).attr('class').substring(10); - neww = transpadd(old, transp - lastTransp); - } - $(this).text( zj_transpose2( $(this).text(), transp - lastTransp ) ); - $(this).removeClass("chord"+old); - $(this).addClass("chord"+neww); - }); - $(".but[data-key]").each(function(){ - console.log($(this)); - var oldKey = $(this).attr('data-key'); - var newKey = transpadd(oldKey, transp - lastTransp); - if ( typeof newKey !== 'undefined' ) - { - //$(this).removeClass('btn-'+oldKey); - //$(this).addClass('btn-'+newKey); - $(this).attr('data-key', newKey); - $(this).text( $(this).attr('data-words') + newKey ); - } - var newhref = $(this).attr('href').match(/(.*?key=).+/)[1] + newKey; - $(this).attr('href', newhref); - }) - lastTransp = transp; -} - -$(".tabs").click(function(e) { - s = window.getSelection(); - var range = s.getRangeAt(0); - var node = s.anchorNode; - while (range.toString().indexOf(' ') != 0 ) { - if (range.startOffset == 0) - break; - range.setStart(node, (range.startOffset - 1)); - } - range.setStart(node, Math.max(0,range.startOffset)); - while (range.toString().lastIndexOf(' ') != range.toString().length - 1 - || range.toString().length <= 1 ) - { - range.setEnd(node, range.endOffset+1); - if ( range.endOffset == node.length) - break; - } - //range.setEnd(Math.min(range.endOffset+1,node.length); - var str = range.toString().trim(); - if( str != "" ) - show_tab(str); -}); - -function show_tab( chord ) -{ - 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); -} - -function getChordFrets(chord) -{ - $("#messages").html(""); - chord = chord.replace("(", ""); - chord = chord.replace(")", ""); - chord = chord.replace("sus", "s"); - chord = chord.replace("s4", "s"); - chord = chord.replace("s", "sus"); - chord = chord.replace("7sus", "sus7"); - chord = chord.replace("mj7", "maj7"); - var chordd = chord; - chordd = chordd.replace("/A","/a"); - chordd = chordd.replace("/B","/b"); - chordd = chordd.replace("/C","/c"); - chordd = chordd.replace("/D","/d"); - chordd = chordd.replace("/E","/e"); - chordd = chordd.replace("/F","/f"); - chordd = chordd.replace("/G","/g"); - chordd = chordd.replace("Db", "C#"); - chordd = chordd.replace("Eb", "D#"); - chordd = chordd.replace("Gb", "F#"); - chordd = chordd.replace("Ab", "G#"); - chordd = chordd.replace("Bb", "A#"); - - plotChord(chord,chordd,guitarObj) - plotChord(chord,chordd,ukeObj) -} - -function plotChord(chord, chordd, obj){ - try{ - tab = obj.dict[chordd][0]; - ChordCharter.drawChord( obj.region, 30, 25, chord, tab ); - obj.chord = chord; - obj.chordd = chordd; - obj.number = 0; - } - catch(target){ - $("#messages").prepend("No "+obj.name+" tab for '" + chord + "'. "); - - // Try it without the base note. - if( chordd.replace(/\/.*/,"") != chordd) - { - plotChord( chord.replace(/\/.*/,""), chordd.replace(/\/.*/,""), obj); - } - } - -} - -function cycle(obj){ - var canvas = $("#"+obj.region)[0]; - var context = canvas.getContext('2d'); - context.clearRect(0, 0, canvas.width, canvas.height); - - obj.number = (obj.number + 1) % obj.dict[obj.chordd].length - tab = obj.dict[obj.chordd][obj.number] - ChordCharter.drawChord( obj.region, 30, 25, obj.chord +"("+obj.number + ")", tab ); -} diff --git a/laravel/public/js/page.js b/laravel/public/js/page.js deleted file mode 100644 index b7a89f7..0000000 --- a/laravel/public/js/page.js +++ /dev/null @@ -1,112 +0,0 @@ -/** - * @brief page.js tries to improve pageload speeds - * by processing client-side. - * @author Zach DeCook (zjd7calvin) - * @date 12, February 2017 - * requires jQuery - */ - -/** - * @brief zj_transpose2 transposes a line - */ -function zj_transpose2( line, transp ) -{ - var newchords = zj_transparray( transp ); - var newline = ''; - var space = 0; ///@< Spaces that need to be added or removed. - for(var i = 0; i < line.length; i++) - { - var chari = line[i]; - var nchar = line[i+1]; - var upchar = line[i].toUpperCase(); - var cval = upchar.charCodeAt(0); - // A-G - if( cval <= 71 && cval >=65 ) - { - // Exception for Cmaj7 - if( upchar == 'A' && nchar == 'j' ) - { - newline += chari; - } - else if( nchar == 'b' || nchar =='#') - { - i++; //We have read an extra character now. - var newchord = newchords[upchar + nchar]; - if( newchord.length == 1 ) - { - // Need to insert an extra space. - space += 1; - } - newline += newchord; - } - else - { - var newchord = newchords[upchar]; - if( newchord.length == 2 ) - { - // Need to remove an extra space. - space -= 1; - } - newline += newchord; - } - } - else if ( chari == ' ' ) - { - if( space >= 0) - { - for (var j = 0; j <= space; j++) - { - newline += ' '; - } - space = 0; - } - else - { - // Only balance negative spaces if one will be left remaining - if( nchar == ' ' ) - { - i++; - space += 1; - } - newline += ' '; - } - } - else - { - newline += chari; - } - } - return newline; -} - -function zj_transparray( transp ) -{ - var chords = - ["C","C#","D","D#","E","F","F#","G","G#","A","Bb","B" ]; - var newchords = []; - // Create array to map old chords to new ones - for (var i=0; i < 12; i++) - { - newchords[chords[i]] = chords[(i+transp+12)%12]; - } - newchords["Db"] = newchords["C#"]; - newchords["Eb"] = newchords["D#"]; - newchords["Gb"] = newchords["F#"]; - newchords["Ab"] = newchords["G#"]; - newchords["A#"] = newchords["Bb"]; - return newchords; -} - -function transpadd( fromkey, integer ) -{ - var chords = {C:0, Db:1, D:2, Eb:3, E:4, F:5, Gb:6, G:7, Ab:8, A:9, Bb:10, B:11}; - chords["C#"] = chords["Db"]; - chords["D#"] = chords["Eb"]; - chords["F#"] = chords["Gb"]; - chords["G#"] = chords["Ab"]; - chords["A#"] = chords["Bb"]; - var ochords = [ "C","Db","D","Eb","E","F","Gb","G","Ab","A","Bb","B" ]; - - var val = ochords[(parseInt(chords[fromkey]) + integer + 24)%12]; - return val; -} -- cgit 1.4.1