From 6a1f30bd128f0a7431f30b17df44a9b779e61f29 Mon Sep 17 00:00:00 2001 From: RoboErikG Date: Fri, 22 Sep 2017 14:15:05 -0700 Subject: [PATCH] Move finished codelab code and fix paths (#1337) * Move the finished version of the codelab This moves the finished version of the codelab to app-completed so it's at the same level as the starting app code. * Fix paths to be relative The paths for blockly files and media were absolute, which would break if you ran it from any directory that wasn't identical. --- .../{completed/finish => app-complete}/index.html | 8 ++++---- .../finish => app-complete}/scripts/main.js | 2 +- .../finish => app-complete}/scripts/music_maker.js | 0 .../finish => app-complete}/scripts/sound_blocks.js | 0 .../finish => app-complete}/sounds/c4.m4a | Bin .../finish => app-complete}/sounds/c5.m4a | Bin .../finish => app-complete}/sounds/d4.m4a | Bin .../finish => app-complete}/sounds/e4.m4a | Bin .../finish => app-complete}/sounds/f4.m4a | Bin .../finish => app-complete}/sounds/g4.m4a | Bin .../finish => app-complete}/styles/index.css | 0 11 files changed, 5 insertions(+), 5 deletions(-) rename demos/codelab/{completed/finish => app-complete}/index.html (91%) rename demos/codelab/{completed/finish => app-complete}/scripts/main.js (98%) rename demos/codelab/{completed/finish => app-complete}/scripts/music_maker.js (100%) rename demos/codelab/{completed/finish => app-complete}/scripts/sound_blocks.js (100%) rename demos/codelab/{completed/finish => app-complete}/sounds/c4.m4a (100%) rename demos/codelab/{completed/finish => app-complete}/sounds/c5.m4a (100%) rename demos/codelab/{completed/finish => app-complete}/sounds/d4.m4a (100%) rename demos/codelab/{completed/finish => app-complete}/sounds/e4.m4a (100%) rename demos/codelab/{completed/finish => app-complete}/sounds/f4.m4a (100%) rename demos/codelab/{completed/finish => app-complete}/sounds/g4.m4a (100%) rename demos/codelab/{completed/finish => app-complete}/styles/index.css (100%) diff --git a/demos/codelab/completed/finish/index.html b/demos/codelab/app-complete/index.html similarity index 91% rename from demos/codelab/completed/finish/index.html rename to demos/codelab/app-complete/index.html index e2d12af1b..107ceefe1 100644 --- a/demos/codelab/completed/finish/index.html +++ b/demos/codelab/app-complete/index.html @@ -60,10 +60,10 @@ - - - - + + + + diff --git a/demos/codelab/completed/finish/scripts/main.js b/demos/codelab/app-complete/scripts/main.js similarity index 98% rename from demos/codelab/completed/finish/scripts/main.js rename to demos/codelab/app-complete/scripts/main.js index 03a47e050..2e8e1572e 100644 --- a/demos/codelab/completed/finish/scripts/main.js +++ b/demos/codelab/app-complete/scripts/main.js @@ -79,7 +79,7 @@ enableMakerMode(); Blockly.inject('blockly-div', { - media: '/media/', + media: '../../../media/', toolbox: document.getElementById('toolbox'), toolboxPosition: 'end', horizontalLayout: true, diff --git a/demos/codelab/completed/finish/scripts/music_maker.js b/demos/codelab/app-complete/scripts/music_maker.js similarity index 100% rename from demos/codelab/completed/finish/scripts/music_maker.js rename to demos/codelab/app-complete/scripts/music_maker.js diff --git a/demos/codelab/completed/finish/scripts/sound_blocks.js b/demos/codelab/app-complete/scripts/sound_blocks.js similarity index 100% rename from demos/codelab/completed/finish/scripts/sound_blocks.js rename to demos/codelab/app-complete/scripts/sound_blocks.js diff --git a/demos/codelab/completed/finish/sounds/c4.m4a b/demos/codelab/app-complete/sounds/c4.m4a similarity index 100% rename from demos/codelab/completed/finish/sounds/c4.m4a rename to demos/codelab/app-complete/sounds/c4.m4a diff --git a/demos/codelab/completed/finish/sounds/c5.m4a b/demos/codelab/app-complete/sounds/c5.m4a similarity index 100% rename from demos/codelab/completed/finish/sounds/c5.m4a rename to demos/codelab/app-complete/sounds/c5.m4a diff --git a/demos/codelab/completed/finish/sounds/d4.m4a b/demos/codelab/app-complete/sounds/d4.m4a similarity index 100% rename from demos/codelab/completed/finish/sounds/d4.m4a rename to demos/codelab/app-complete/sounds/d4.m4a diff --git a/demos/codelab/completed/finish/sounds/e4.m4a b/demos/codelab/app-complete/sounds/e4.m4a similarity index 100% rename from demos/codelab/completed/finish/sounds/e4.m4a rename to demos/codelab/app-complete/sounds/e4.m4a diff --git a/demos/codelab/completed/finish/sounds/f4.m4a b/demos/codelab/app-complete/sounds/f4.m4a similarity index 100% rename from demos/codelab/completed/finish/sounds/f4.m4a rename to demos/codelab/app-complete/sounds/f4.m4a diff --git a/demos/codelab/completed/finish/sounds/g4.m4a b/demos/codelab/app-complete/sounds/g4.m4a similarity index 100% rename from demos/codelab/completed/finish/sounds/g4.m4a rename to demos/codelab/app-complete/sounds/g4.m4a diff --git a/demos/codelab/completed/finish/styles/index.css b/demos/codelab/app-complete/styles/index.css similarity index 100% rename from demos/codelab/completed/finish/styles/index.css rename to demos/codelab/app-complete/styles/index.css