From 54cc4666edb8c2c9a9c39cd5cf7a4713ce5ed571 Mon Sep 17 00:00:00 2001 From: louis-coding Date: Mon, 14 Jul 2014 14:25:00 +0200 Subject: [PATCH 1/7] Update ugsEditorPlus.submenuUi.js replaced "Soprano" w/ "Standard" tuning, corrected baritone tuning from DBEA to DGBE --- src/js/editor/ugsEditorPlus.submenuUi.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/editor/ugsEditorPlus.submenuUi.js b/src/js/editor/ugsEditorPlus.submenuUi.js index 74b5de8..7d4f998 100644 --- a/src/js/editor/ugsEditorPlus.submenuUi.js +++ b/src/js/editor/ugsEditorPlus.submenuUi.js @@ -204,7 +204,7 @@ ugsEditorPlus.submenuUi = (function(){ 'zoomDiagrams' : ['Tiny', 'Small', 'Medium', 'Large', 'Stupid Large'], 'layout' : ['Reference diagrams on left', 'Reference diagrams at top', 'No reference diagrams'], 'placement' : ['Chord names inline with lyrics', 'Chord names above lyrics', 'Names & diagrams above lyrics'], - 'tuning' : ['Soprano (GCEA) tuning', 'Baritone (DBEA) tuning'] + 'tuning' : ['Standard (GCEA) tuning', 'Baritone (DGBE) tuning'] }; /** @@ -247,4 +247,4 @@ ugsEditorPlus.submenuUi = (function(){ // --------------------------------------- return _public; -}()); \ No newline at end of file +}()); From 683c4f3895832204ec90b53bc6752005f3167807 Mon Sep 17 00:00:00 2001 From: louis-coding Date: Mon, 14 Jul 2014 14:44:19 +0200 Subject: [PATCH 2/7] replaced "Soprano" by "Standard" GCEA is not limited to Soprano size... --- src/js/editor/ugsEditorPlus.actions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/editor/ugsEditorPlus.actions.js b/src/js/editor/ugsEditorPlus.actions.js index 779e42e..f75e15f 100644 --- a/src/js/editor/ugsEditorPlus.actions.js +++ b/src/js/editor/ugsEditorPlus.actions.js @@ -324,11 +324,11 @@ ugsEditorPlus.actions = (function() { */ var doTuning = function(value){ var tuning = ukeGeeks.definitions.instrument.sopranoUke, - msg = 'Standard GCEA Soprano Ukulele'; + msg = 'GCEA Standard Ukulele'; if (value == 'baritone') { tuning = ukeGeeks.definitions.instrument.baritoneUke; - msg = 'Standard DGBE Baritone Ukulele'; + msg = 'DGBE Baritone Ukulele'; } $('#footTuningInfo').html(msg); @@ -497,4 +497,4 @@ ugsEditorPlus.actions = (function() { // --------------------------------------- return _public; -}()); \ No newline at end of file +}()); From 36e58a7a168a191855662ef3a909efcfe67ec307 Mon Sep 17 00:00:00 2001 From: louis-coding Date: Mon, 14 Jul 2014 14:59:40 +0200 Subject: [PATCH 3/7] replaced "Soprano" with "Standard" --- .../scriptasaurus/ukeGeeks.definitions.sopranoUkuleleGcea.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/scriptasaurus/ukeGeeks.definitions.sopranoUkuleleGcea.js b/src/js/scriptasaurus/ukeGeeks.definitions.sopranoUkuleleGcea.js index 191cfc5..ec5db4d 100644 --- a/src/js/scriptasaurus/ukeGeeks.definitions.sopranoUkuleleGcea.js +++ b/src/js/scriptasaurus/ukeGeeks.definitions.sopranoUkuleleGcea.js @@ -7,7 +7,7 @@ ukeGeeks.definitions.sopranoUkuleleGcea = [ // Required: Instruement Name and Tuning (string names) // ------------------------------------------------------- - '{instrument: Soprano Ukulele}', + '{instrument: Standard Ukulele}', '{tuning: G C E A}', // Ab returns G# // A @@ -210,4 +210,4 @@ ukeGeeks.definitions.sopranoUkuleleGcea = [ '{define: G/F# frets 0 2 2 2}', '{define: G/F frets 0 2 1 2}', '{define: G7/B frets 0 2 1 2}' -]; \ No newline at end of file +]; From ec8aa4d3b7cd7fe002224ce93b5b818feb9ca086 Mon Sep 17 00:00:00 2001 From: louis-coding Date: Mon, 14 Jul 2014 15:06:19 +0200 Subject: [PATCH 4/7] Standard tuning is not limited to Soprano --- ugsphp/views/song.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ugsphp/views/song.php b/ugsphp/views/song.php index 3277595..9792bd4 100644 --- a/ugsphp/views/song.php +++ b/ugsphp/views/song.php @@ -56,9 +56,9 @@
-

Note: Standard GCEA Soprano Ukulele Tuning. Powered by UkeGeeks' Scriptasaurus • ukegeeks.com

+

Note: GCEA Standard Ukulele Tuning. Powered by UkeGeeks' Scriptasaurus • ukegeeks.com

- \ No newline at end of file + From 16aa8153a8356f594ce6d3dd93e50a2d15ce5e2a Mon Sep 17 00:00:00 2001 From: louis-coding Date: Mon, 14 Jul 2014 15:08:28 +0200 Subject: [PATCH 5/7] Standard tuning is not limited to Soprano --- ugsphp/views/song-editable.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ugsphp/views/song-editable.php b/ugsphp/views/song-editable.php index ff63046..7c6db97 100644 --- a/ugsphp/views/song-editable.php +++ b/ugsphp/views/song-editable.php @@ -44,7 +44,7 @@ function GetDisplayStyle($value){ @@ -159,10 +159,10 @@ function GetDisplayStyle($value){
  • +6 F#
    • -
    +
    @@ -311,4 +311,4 @@ function GetDisplayStyle($value){ }); - \ No newline at end of file + From f26df37659ae847d5b66101148f24ceefb293e04 Mon Sep 17 00:00:00 2001 From: louis-coding Date: Mon, 14 Jul 2014 15:13:30 +0200 Subject: [PATCH 6/7] added comment about trailing comma after last option the last enabled option MUST NOT be followed by a comma, array format is {option1, option2, lastoption} - using {option1, option2, lastoption,} will break the array and cause json errors --- ugsphp/settings.json_example | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ugsphp/settings.json_example b/ugsphp/settings.json_example index 47dfcbb..dbd44dd 100644 --- a/ugsphp/settings.json_example +++ b/ugsphp/settings.json_example @@ -1,5 +1,6 @@ { // Remove the double-slashes (the "//" are JavaScript line comment markers) preceeding any option you wish to change + // Make sure you don't have a trailing comma after the last enabled option /* If true the Edit Song box is shown when the page loads; false hides it. * Allowed values: true, false @@ -61,4 +62,4 @@ * Allowed values (string or array of strings): as an array of strings: ["A", "G"] or comma delimited list: "A, G" */ // "commonChords": ["A", "B", "C", "D", "E", "F", "G", "Am"] -} \ No newline at end of file +} From bb6c6485d4eac72e93b73ac6110c63ad3fe51beb Mon Sep 17 00:00:00 2001 From: louis-coding Date: Mon, 14 Jul 2014 16:23:08 +0200 Subject: [PATCH 7/7] updated tuning comments --- src/js/scriptasaurus/ukeGeeks.definitions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/scriptasaurus/ukeGeeks.definitions.js b/src/js/scriptasaurus/ukeGeeks.definitions.js index 24f03e5..46bc229 100644 --- a/src/js/scriptasaurus/ukeGeeks.definitions.js +++ b/src/js/scriptasaurus/ukeGeeks.definitions.js @@ -34,8 +34,8 @@ ukeGeeks.definitions = (function() { * @type JSON */ _public.instrument = { - sopranoUke: 0, // GCEA - baritoneUke: 5 // DGBA -- Baritone's "A" fingering is the Soprano's "D" + sopranoUke: 0, // GCEA -- standard tuning G4 (or G3)-C4-E4-A4 + baritoneUke: 5 // DGBE -- 5 steps lower than standard Soprano tuning: D3-G3-B3-E4 }; /* PUBLIC METHODS @@ -192,4 +192,4 @@ ukeGeeks.definitions = (function() { }; return _public; -}()); \ No newline at end of file +}());