diff --git a/llab/script/curriculum.js b/llab/script/curriculum.js index 3a3b2f5758..f107d5b423 100755 --- a/llab/script/curriculum.js +++ b/llab/script/curriculum.js @@ -343,7 +343,7 @@ llab.setupTitle = function() { // Create the header section and nav buttons llab.createTitleNav(); - var titleText = llab.getQueryParameter("title"); + let titleText = llab.getQueryParameter("title"); if (titleText !== '') { document.title = titleText; } diff --git a/llab/script/library.js b/llab/script/library.js index 05f2263474..f2bce20f91 100644 --- a/llab/script/library.js +++ b/llab/script/library.js @@ -397,7 +397,15 @@ llab.merge = function(objA, objB) { }; llab.getURLParameters = function() { - return llab.QS.parse(location.search); + let stripHTML = (content) => $('
').text(content).html(); + if (!llab.safeURLParams) { + llab.safeURLParams = {}; + const searchParams = new URLSearchParams(location.search); + for (const [param, value] of searchParams) { + llab.safeURLParams[param] = stripHTML(value); + } + } + return llab.safeURLParams; }; llab.getAttributesForElement = function(elm) { diff --git a/sparks/student-pages/U2/L2/07-planning-animation.html b/sparks/student-pages/U2/L2/07-planning-animation.html index c45143a13e..fd788b6420 100644 --- a/sparks/student-pages/U2/L2/07-planning-animation.html +++ b/sparks/student-pages/U2/L2/07-planning-animation.html @@ -17,7 +17,7 @@

Planning Your Animation

  • You can create animation by changing costumes. This sprite isn't moving; it just has four costumes and is changing between them using this script:
    - forever { + <img class=
    Will the sprite(s) ever change costumes?
    - animation of a cartoon character walking that has been created by changing between four different costumes + animation of a cartoon character walking that has been created by changing between four different costumes
    There is a gray "play" button in the middle of the image above and also a few images below. If you click an image with a play button once, an animation will play. If you click it again, the animation will stop.
    • @@ -36,7 +36,7 @@

    Planning Your Animation

  • Will the sprite(s) say or think anything?
    - animation of a cartoon character with a thought bubble thinking, 'Hmmm... we are out of bread,' and then with a speech bubble saying 'Hey, do you need anything from the store?' + animation of a cartoon character with a thought bubble thinking, 'Hmmm... we are out of bread,' and then with a speech bubble saying 'Hey, do you need anything from the store?'
  • Will there be any special effects (such as fading out or changing color)? diff --git a/sparks/student-pages/U3/L2/03-adding-interactivity.html b/sparks/student-pages/U3/L2/03-adding-interactivity.html index e50ad4ea17..315f4e8076 100644 --- a/sparks/student-pages/U3/L2/03-adding-interactivity.html +++ b/sparks/student-pages/U3/L2/03-adding-interactivity.html @@ -24,7 +24,7 @@

    Collect Materials

    To make your pet interactive, you will need to use at least two different inputs that cause at least two different outputs. Consider the following inputs and decide which one to use to enhance your pet’s personality or story.

    diff --git a/sparks/student-pages/U3/L4/01-make-it-move.html b/sparks/student-pages/U3/L4/01-make-it-move.html index 6f67b7bc1b..d445432c3e 100644 --- a/sparks/student-pages/U3/L4/01-make-it-move.html +++ b/sparks/student-pages/U3/L4/01-make-it-move.html @@ -21,7 +21,7 @@

    Collect Materials

  • Crazy Circuits Bit Board
  • Servo motor
  • Craft supplies (see Lab 2 Activity 2: Building Your Pet)
    • - + diff --git a/sparks/teaching-guide/U2/02-graphics-animation.html b/sparks/teaching-guide/U2/02-graphics-animation.html index c9d52a5ba3..383b594819 100644 --- a/sparks/teaching-guide/U2/02-graphics-animation.html +++ b/sparks/teaching-guide/U2/02-graphics-animation.html @@ -11,7 +11,7 @@

    Lab 2: Graphics and Animation

    I moved the "Learning Goals" section before "Prepare" so that teachers know what they are preparing for. Need to go back and do this to prior labs. --MF, 10/23/23

    After experimenting with song writing as an introduction to sequencing and looping commands, students explore the graphical aspects of Snap! programing, including sprite movement and costumes as well as events such as clicking a sprite or a specific area on the Snap!. stage. One goal is for students to create a fun and/or useful object of their own design such as an animated greeting card to share with others or an interactive poster for a presentation topic in another class. Another goal is for students to consider the user experience and solicit feedback before and after coding the project.

    - +

    In response to teacher requests for shorter lab pages and more opportunities for differentiation, Unit 2 Lab 2 offers a greater number of shorter lab pages, some of which are entirely optional. To further shorten the appearance of the student-facing pages (both to present more manageable-looking content and to facilitate navigation), more of the text has been hidden behind links that open additional information available on the page.

    As the teacher, you may choose which of these optional pages to include (suggestions on how to decide below) based on your teaching context. Please provide us with your feedback on this new model as we consider whether to design/redesign other BJC Sparks labs with these formatting changes.

    @@ -88,7 +88,7 @@

    Activity 1: Sprite Costumes and Stage Backgrounds.↑ Back to Top

    Activity 2: Planning Your Interactive Project 

    @@ -382,7 +382,7 @@

    Activity 8: Creating an Animation 

    • Materials: Creating an Animation student page
      • - animation of a cartoon character walking that has been created by changing between four different costumes + animation of a cartoon character walking that has been created by changing between four different costumes
    • Learning Goals:
        @@ -416,7 +416,7 @@

        Activity 8: Creating an Animation 

        -->
    - + ↑ Back to Top

    Activity 9: Responding to Events 

    @@ -461,7 +461,7 @@

    Activity 9: Responding to Events 

    -->
    - + ↑ Back to Top

    Activity 10: Importing Code 

    @@ -505,7 +505,7 @@

    Activity 10: Importing Code 

    - + ↑ Back to Top

    Activity 11: Adding Sounds 

    @@ -549,7 +549,7 @@

    Activity 11: Adding Sounds 

    - + ↑ Back to Top

    Activity 12: Choosing Your Click Areas 

    @@ -597,7 +597,7 @@

    Activity 12: Choosing Your Click Areas -->

    - + ↑ Back to Top

    Activity 13: Setting Up Your Click Areas 

    @@ -637,7 +637,7 @@

    Activity 13: Setting Up Your Click Areas < -->

    - + ↑ Back to Top

    Activity 14: Broadcasting a Click Message 

    @@ -681,7 +681,7 @@

    Activity 14: Broadcasting a Click Message  -->

    - + ↑ Back to Top

    Activity 15: Testing and Improving Your Interactive Project 

    @@ -735,7 +735,7 @@

    Activity 15: Testing and Improving Your Interactive Project

    - + ↑ Back to Top

    Correlation with CSTA Standards 

    diff --git a/topic/middle-school b/topic/middle-school new file mode 120000 index 0000000000..5fa19de128 --- /dev/null +++ b/topic/middle-school @@ -0,0 +1 @@ +sparks \ No newline at end of file diff --git a/topic/sparks/3-teaching-guide.topic b/topic/sparks/3-teaching-guide.topic index 7bfe09f69b..d175e953f1 100644 --- a/topic/sparks/3-teaching-guide.topic +++ b/topic/sparks/3-teaching-guide.topic @@ -13,7 +13,7 @@ h3: CSTA Standards: raw-html:
  • 2-CS-01: Recommend improvements to the design of computing devices, based on an analysis of how users interact with the devices.
    • raw-html:
  • 2-CS-02: Design projects that combine hardware and software components to collect and exchange data.
    • raw-html:
  • 2-CS-03: Systematically identify and fix problems with computing devices and their components.
    • - raw-html:
    2-AP-13 and 2-AP-13 are also covered in U1, and these are planned for U2:
    • 2-AP-10
    • 2-AP-11
    • 2-AP-12
    • 2-AP-13
    • 2-AP-14
    • 2-AP-16
    • 2-AP-17
    + raw-html:
    2-AP-13 and 2-AP-13 are also covered in U1, and these are planned for U2:
    • 2-AP-10
    • 2-AP-11
    • 2-AP-12
    • 2-AP-13
    • 2-AP-14
    • 2-AP-16
    • 2-AP-17
    raw-html:
  • 2-AP-10: Use flowcharts and/or pseudocode to address complex problems as algorithms.
    • raw-html:
  • 2-AP-11: Create clearly named variables that represent different data types and perform operations on their values.
    • raw-html:
  • 2-AP-12: Design and iteratively develop programs that combine control structures, including nested loops and compound conditionals.