From a3435741c988a2563f9b926f8c3dcff74811598d Mon Sep 17 00:00:00 2001 From: grantElgin Date: Sun, 25 Nov 2012 17:33:38 -0500 Subject: [PATCH] trying to load only the js file from live server --- p3/css/tuner.css | 5 ++++- p3/getInTune.html | 43 ++++++++++++++++++++++++++++++++++++++++++- p3/getInTune.js | 20 +++++++++++++++++--- p3/tune.html | 13 +++++++------ 4 files changed, 70 insertions(+), 11 deletions(-) diff --git a/p3/css/tuner.css b/p3/css/tuner.css index be828a1..c6499c3 100644 --- a/p3/css/tuner.css +++ b/p3/css/tuner.css @@ -1 +1,4 @@ -.string { width:30px; height:30px; border:1px solid #007cff; background-color: #06538b; color:white; font-family: sans-serif; font-weight:bold; font-size:20px; text-align: center; padding-top:10px; margin-top: 5px; margin-right:5px; float:left; cursor: pointer; } \ No newline at end of file +.string { width:30px; height:30px; border:1px solid #007cff; background-color: #06538b; color:white; font-family: sans-serif; font-weight:bold; font-size:20px; text-align: center; padding-top:10px; margin-top: 5px; margin-right:5px; float:left; cursor: pointer; } + +h1 { font-family: sans-serif; font-size: 24px; color:black; margin-bottom:0px; } +p { font-family: sans-serif; font-size: 18px; color:black;} \ No newline at end of file diff --git a/p3/getInTune.html b/p3/getInTune.html index b9009b6..d4fb30e 100644 --- a/p3/getInTune.html +++ b/p3/getInTune.html @@ -16,7 +16,48 @@ -
Get in tune!
+

Get In Tune!

+

guitar tuner

+ +
+
Get in tune!
X


+
Standard tuning

+
E
+
A
+
D
+
G
+
B
+
e
+
+
Click a note above to hear the tone.
Click it again to stop.
+ +
+ + + +
+

Bookmarklet coming soon!

+

Drag this link to your bookmarks bar to load the tuner while viewing other web pages.

+
Get in tune!
diff --git a/p3/getInTune.js b/p3/getInTune.js index 96edde3..ae8d9d7 100644 --- a/p3/getInTune.js +++ b/p3/getInTune.js @@ -18,12 +18,26 @@ if (window.jQuery === undefined || window.jQuery.fn.jquery < v) { initGetInTune(); } - // Append div to body and load tuner. + // Append divs to body and load tuner. function initGetInTune() { var containerDiv = document.createElement('div'); - $(containerDiv).load('http://www.grantelgin.com/dwa/p3/tune.html', function (){ console.log(containerDiv.innerHTML); }); - document.body.appendChild(containerDiv); + var div1 = '
'; + var div2 = '
Get in tune!
'; + var div3 = '
X


'; + var div4 = '
Standard tuning

'; + var div5E = '
E
'; + var div5A = '
A
'; + var div5D = '
D
'; + var div5G = '
G
'; + var div5B = '
B
'; + var div51 = '
e
'; + var div6 = '
Click a note above to hear the tone.
Click it again to stop.
'; + var div7 = ''; + var div8 = '
'; + containerDiv.innerHTML = div1 + div2 + div3 + div4 + div5E + div5A + div5D + div5G + div5B + div51 + div6 + div7 + div8; + document.body.appendChild(containerDiv); + } }()); diff --git a/p3/tune.html b/p3/tune.html index 709ef8d..8d0b4c2 100644 --- a/p3/tune.html +++ b/p3/tune.html @@ -1,16 +1,17 @@
Get in tune!
X


Standard tuning

-
E
-
A
-
D
-
G
-
B
-
e
+
E
+
A
+
D
+
G
+
B
+
e
Click a note above to hear the tone.
Click it again to stop.