Skip to content

Commit 1582f30

Browse files
committed
Update initial set key, demo links
1 parent 8ef9ad0 commit 1582f30

File tree

3 files changed

+73
-69
lines changed

3 files changed

+73
-69
lines changed

ScaleDictionary.js

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ kGsharp = {"name" : "G♯", "safename" : "Gsharp","baseScale" : CHROMSHARP,
2727

2828
// dict keys collects above objects
2929
var dictKeys = {
30-
"Cnatural" : kC,
31-
"Dflat" : kDflat,
32-
"Dnatural" : kD,
33-
"Eflat" : kEflat,
34-
"Enatural" : kE,
35-
"Fnatural" : kF,
36-
"Gflat" : kGflat,
37-
"Gnatural" : kG,
38-
"Aflat" : kAflat,
39-
"Anatural" : kA,
40-
"Bflat" : kBflat,
41-
"Bnatural" : kB,
42-
"Csharp" : kCsharp,
43-
"Fsharp" : kFsharp,
30+
"Cnatural" : kC,
31+
"Dflat" : kDflat,
32+
"Dnatural" : kD,
33+
"Eflat" : kEflat,
34+
"Enatural" : kE,
35+
"Fnatural" : kF,
36+
"Gflat" : kGflat,
37+
"Gnatural" : kG,
38+
"Aflat" : kAflat,
39+
"Anatural" : kA,
40+
"Bflat" : kBflat,
41+
"Bnatural" : kB,
42+
"Csharp" : kCsharp,
43+
"Fsharp" : kFsharp,
4444
"Gsharp" : kGsharp };
4545

4646
var INTS_FLATS = ['R', '♭9', '9', '♭3', '3', '11', '♭5', '5', '♭13', '13', '♭7', '7'];
@@ -52,9 +52,9 @@ var INTS_SUPERLOCRIAN = ['R', '♭9', '9', '♭3', '♭4', '11', '&#
5252
var _ROOT = {
5353
'SEMI' : 0,
5454
'INT' : 'R',
55-
'CLR' : 'i__ROOT'
55+
'CLR' : 'i__ROOT'
5656
}
57-
57+
5858
var FLATNINE = {
5959
'SEMI' : 1,
6060
'INT' : '♭9',
@@ -71,26 +71,26 @@ var SHARPNINE = {
7171
'SEMI' : 3,
7272
'INT' : '♯11',
7373
'CLR' : 'i_sharpnine'
74-
}
74+
}
7575

7676
var FLATTHREE = {
7777
'SEMI' : 3,
7878
'INT' : '♭3',
7979
'CLR' : 'i_third'
8080
}
81-
81+
8282
var THIRD = {
8383
'SEMI' : 4,
8484
'INT' : '3',
8585
'CLR' : 'i_third'
86-
}
86+
}
8787

8888
var DIMELEVEN = {
8989
'SEMI' : 4,
9090
'INT' : '♭11',
9191
'CLR' : 'i_fourth'
9292
}
93-
93+
9494
var ELEVEN = {
9595
'SEMI' : 5,
9696
'INT' : '11',
@@ -114,7 +114,7 @@ var FIFTH = {
114114
'INT' : '5',
115115
'CLR' : 'i_fifth'
116116
}
117-
117+
118118
var AUGFIVE = {
119119
'SEMI' : 8,
120120
'INT' : '♯5',
@@ -126,46 +126,46 @@ var FLATTHIRTEEN = {
126126
'INT' : '♭13',
127127
'CLR' : 'i_sixth'
128128
}
129-
129+
130130
var THIRTEEN = {
131131
'SEMI' : 9,
132132
'INT' : '13',
133133
'CLR' : 'i_sixth'
134-
}
134+
}
135135

136136
var AUGTHIRTEEN = {
137137
'SEMI' : 10,
138138
'INT' : '♯13',
139139
'CLR' : 'i_sixth'
140-
}
140+
}
141141

142142
var FLATSEVEN = {
143143
'SEMI' : 10,
144144
'INT' : '♭7',
145145
'CLR' : 'i_seventh'
146-
}
146+
}
147147

148148
var SEVENTH = {
149149
'SEMI' : 11,
150150
'INT' : '7',
151151
'CLR' : 'i_seventh'
152-
}
153-
152+
}
153+
154154
var TX = {
155155
// tone outside of scale, inherit semitone and int
156156
'SEMI' : -1,
157157
'INT' : '',
158158
'CLR' : 'white'
159-
}
159+
}
160160

161161
var TI = {
162162
// tone in scale, inherit semitone and int
163163
'SEMI' : -1,
164164
'INT' : '',
165165
'CLR' : 'black'
166166
}
167-
168-
// Scale Formulas
167+
168+
// Scale Formulas
169169
var IF_IONIAN = [_ROOT, TX, TI, TX, THIRD, TI, TX, FIFTH, TX, TI, TX, SEVENTH];
170170
var IF_LYDIAN = [_ROOT, TX, TI, TX, THIRD, TX, SHARPELEVEN, FIFTH, TX, TI, TX, SEVENTH];
171171
var IF_MIXOLYDIAN = [_ROOT, TX, TI, TX, THIRD, TI, TX, FIFTH, TX, TI, FLATSEVEN, TX];
@@ -221,12 +221,12 @@ var SC_PENTDOM = { "name" : "Dominant Pentatonic", "intnames": INTS_FLATS, "col
221221

222222

223223
var dictScales = {
224-
"SC_MAJOR": SC_MAJOR,
225-
"SC_LYDIAN": SC_LYDIAN,
226-
"SC_MIXOLYDIAN": SC_MIXOLYDIAN,
227-
"SC_DORIAN": SC_DORIAN,
228-
"SC_AEOLIAN": SC_AEOLIAN,
229-
"SC_PHRYGIAN": SC_PHRYGIAN,
224+
"SC_MAJOR": SC_MAJOR,
225+
"SC_LYDIAN": SC_LYDIAN,
226+
"SC_MIXOLYDIAN": SC_MIXOLYDIAN,
227+
"SC_DORIAN": SC_DORIAN,
228+
"SC_AEOLIAN": SC_AEOLIAN,
229+
"SC_PHRYGIAN": SC_PHRYGIAN,
230230
"SC_LOCRIAN": SC_LOCRIAN,
231231
"SC_DIMINISHED": SC_DIMINISHED,
232232
"SC_PENTMIN": SC_PENTMIN,
@@ -243,7 +243,7 @@ var dictScales = {
243243
};
244244

245245
var ScaleModel = {
246-
246+
247247
"scale" : dictScales["SC_MAJOR"]
248248
,
249249
"setScale" : function(newScale){
@@ -263,14 +263,14 @@ var ScaleModel = {
263263
"getScaleName" : function(){
264264
var s = this["scale"];
265265
return s["name"];
266-
}
267-
268-
269-
};
270-
266+
}
267+
268+
269+
};
270+
271+
271272

272273

273-
274274
//arps
275275
var INTCLR_MAJ = ["i_root", "white","white","white","i_third","white","white","i_fifth","white","white","white","white"];
276276
var INTCLR_MAJ7 = ["i_root", "white","white","white","i_third","white","white","i_fifth","white","white","white","i_seventh"];
@@ -279,7 +279,7 @@ var INTCLR_MIN = ["i_root", "white","white","i_third","white","white","white","i
279279
var INTCLR_MIN7 = ["i_root", "white","white","i_third","white","white","white","i_fifth","white","white","i_seventh","white"];
280280
var INTCLR_MIN7b5 = ["i_root", "white","white","i_third","white","white","i_fifth","white","white","white","i_seventh","white"];
281281
var INTCLR_DIM = ["i_root", "white","white","i_third","white","white","i_fifth","white","white","i_seventh","white","white"];
282-
282+
283283
var ARP_MAJ = { "name" : "maj", "intnames": INTS_FLATS, "color" : INTCLR_MAJ };
284284
var ARP_MAJ7 = { "name" : "maj7", "intnames": INTS_SHARP4, "color" : INTCLR_MAJ7 };
285285
var ARP_DOM7 = { "name" : "7", "intnames": INTS_SHARP4, "color" : INTCLR_DOM7 };
@@ -315,31 +315,31 @@ var FretboardModel = {
315315
"ngType" : dictScales,
316316

317317
"getChromNames" : function(){
318-
var cn = this["chromNames"];
318+
var cn = this["chromNames"];
319319
return cn;
320320
},
321321
"setChromNames" : function(cn){
322322
this["chromNames"] = cn;
323323
},
324324
"getKeyObj" : function(){
325-
var kObj = this["key"];
325+
var kObj = this["key"];
326326
return kObj;
327327
},
328328
"getKeyTextName" : function(){
329329
// return text html name for CURRENT key
330-
var kObj = this["key"];
330+
var kObj = this["key"];
331331
return kObj["name"];
332332
},
333333

334334
"getKeySafeName" : function(){
335335
// returns safename for CURRENT key
336-
var kObj= this["key"];
336+
var kObj= this["key"];
337337
return kObj["safename"];
338-
},
339-
338+
},
339+
340340
"getKeyInt" : function(){
341341
// returns int for CURRENT key
342-
var kObj = this["key"];
342+
var kObj = this["key"];
343343
return kObj["fromC"];
344344
},
345345
"setKey" : function(kObj){
@@ -356,27 +356,27 @@ var FretboardModel = {
356356
// chrom names array will start with KEY as root
357357
this["chromNames"] = newscale;
358358
},
359-
359+
360360
"getNotegroupDict" : function(){
361361
// returns CURRENT ng dictionary
362-
var d = this["ngType"];
362+
var d = this["ngType"];
363363
return d;
364-
},
365-
364+
},
365+
366366
"getNotegroup" : function(){
367367
var dict = this["ngType"];
368368
var ng = dict[this["ng"]];
369369
return ng;
370370
},
371-
371+
372372
"setNotegroup" : function(ng, typeDict){
373373
if(arguments.length < 2){
374374
arr = ng.split('_');
375375
switch(arr[0]){
376376
case "SC":
377377
this["ngType"] = dictScales;
378378
break;
379-
case "ARP":
379+
case "ARP":
380380
this["ngType"] = dictArps;
381381
break;
382382
case "CHD":
@@ -386,16 +386,16 @@ var FretboardModel = {
386386
} else {
387387
this["ngType"] = typeDict;
388388
}
389-
389+
390390
this["ng"] = ng;
391391
},
392-
392+
393393
"getNGname" : function(){
394394
var dict = this["ngType"];
395395
var ng = dict[this["ng"]];
396396
return ng["name"];
397397
},
398-
398+
399399
"getNGintcolor" : function(){
400400
var dict = this["ngType"];
401401
var ng = dict[this["ng"]];
@@ -406,5 +406,5 @@ var FretboardModel = {
406406
var ng = dict[this["ng"]];
407407
return ng["intnames"]; // returns array of html texts
408408
},
409-
410-
};
409+
410+
};

boxfrets.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -808,21 +808,17 @@ jQuery(document).ready(function() {
808808
}
809809
$('#fretclone > tbody:last').append(newRow);
810810

811-
//populateScaleMenu(); // removed from view
812-
813811
var url_params = get_url_parameters();
814812
var loadFromUrl = function(){
813+
815814
if (is_defined(url_params['intColor'])){
816815
if(url_params['intColor'] == "true"){
817816

818817
ctl_updateColorIntMode(true);
819818
}
820819
}
821820

822-
if (is_defined(url_params['key'])){
823-
// key should use safename
824-
ctl_change_key.keyChangeNotegroup(url_params['key']);
825-
}
821+
826822
if (is_defined(url_params['intNames'])){
827823
if(url_params['intNames'] == "true"){
828824
ctl_updateIntervalMode(true);
@@ -847,6 +843,10 @@ jQuery(document).ready(function() {
847843
fill_from_repr(url_params['strings']);
848844
}
849845
}
846+
if (is_defined(url_params['key'])){
847+
// key should use safename
848+
ctl_change_key.setRoot(getKeyObjFromSafeName(url_params['key']));
849+
}
850850
}
851851
loadFromUrl();
852852
update_link();

fretboard.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,15 @@
189189

190190
<li><a href="#strings=3:19;2:19;3:19;2:20;;&key=Gnatural&intColor=false&intNames=false&diagram_title=Edim7%20Fingering"
191191
>Edim7 fingering</a></li>
192-
<li><a href="#strings=0:14,2:7,5:11,7:0,10:4,12:14,14:7;0:0,3:4,5:14,7:7,10:11,12:0,15:4;2:11,4:0,7:4,9:14,11:7,14:11;0:4,2:14,4:7,7:11,9:0,12:4,14:14;0:11,2:0,5:4,7:14,9:7,12:11,14:0;0:14,2:7,5:11,7:0,10:4,12:14,14:7&key=Bnatural&intColor=false&intNames=true&diagram_title=B%20minor%20pentatonic&dash=Cnatural_ARP_MIN7,Fnatural_ARP_MIN7,Bflat_ARP_MIN,Eflat_ARP_DOM7,Aflat_ARP_MAJ"
192+
<li><a href="#strings=0:14,2:7,5:11,7:0,10:4,12:14,14:7,17:11;0:0,3:4,5:14,7:7,10:11,12:0,15:4,17:14;2:11,4:0,7:4,9:14,11:7,14:11,16:0;0:4,2:14,4:7,7:11,9:0,12:4,14:14,16:7;0:11,2:0,5:4,7:14,9:7,12:11,14:0,17:4;0:14,2:7,5:11,10:4,12:14,14:7,17:11&key=Bnatural&intColor=false&intNames=false&diagram_title=B%20Minor%20Pentatonic"
193193
>B minor pentatonic</a></li>
194194
<li><a href="#strings=;5:15;5:15;5:15;;5:20&key=Anatural&intColor=false&intNames=true&diagram_title=A-7%20Fingering"
195195
>A-7 fingering</a></li>
196196

197+
<li><a href="#strings=2:16,5:19,9:16,12:19,14:16;2:16,5:19,7:16,10:19,14:16;2:16,6:19,9:16,11:19,14:16;2:16,4:19,7:16,11:19,14:16;;&key=Fsharp&intColor=false&intNames=false&diagram_title=A%20Major%206th%20%3D%20F%23%20Minor%207th%20%3A%20b3%20of%20Min7%20%3D%20relative%20Maj%206%2C%2013%20of%20Maj6%20%3D%20relative%20Min6">
198+
A6 / F# min7</a>
199+
</li>
200+
197201
</ul>
198202
</div>
199203
</div>

0 commit comments

Comments
 (0)