Skip to content

don't use Blockly at all on editCode levels#403

Merged
cpirich merged 2 commits into
stagingfrom
editCode_no_blockly
Nov 12, 2014
Merged

don't use Blockly at all on editCode levels#403
cpirich merged 2 commits into
stagingfrom
editCode_no_blockly

Conversation

@cpirich

@cpirich cpirich commented Nov 12, 2014

Copy link
Copy Markdown
Contributor

Previously, editCode levels still kept a div around called Blockly, loaded the blockly-core vendor.js, and injected Blockly into the page (while keeping it hidden).

I cleaned this up now so BlocklyApps.usingBlockly is the opposite of BlocklyApps.editCode and we only do Blockly things inside BlocklyApps.usingBlockly.

This means that editCode pages no longer load the vendor.js script file (there is no Blockly object available at runtime) and no longer include a hidden element with the id of 'blockly'. Any level attributes that require blocks (like predrawBlocks in turtle) will need to be modified for editCode levels to use actual code.

Added TODO comments for 3 things that are currently missing in editCode mode:

  • Audio (this used to work, but required Blockly): we need to enable audio playback in the apps layer
  • Required blocks (never worked for editCode): now it is more clear where this would go
  • Block count (never worked for editCode): shouldn't be too hard to add this when using droplet, if we think it still makes sense to do so

davidsbailey
davidsbailey reviewed Nov 12, 2014
View reviewed changes
Comment thread blockly/src/appMain.js Outdated

@davidsbailey davidsbailey Nov 12, 2014

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These flags contain redundant state, and their names are not obviously mutually exclusive. How about "usingDroplet" instead of "editCode"? If you don't want to rename them, please add a comment stating they are mutually exclusive.

@cpirich cpirich Nov 12, 2014

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll at least add a comment. Theoretically, we could have yet another type (besides Blockly and Droplet), such as the plain ace editor. In which case, they wouldn't be mutually exclusive. I like the suggestion of usingDroplet, but am concerned about it being different from the level parameter called editCode (maybe I should change all of those too)

@davidsbailey

davidsbailey commented Nov 12, 2014

Copy link
Copy Markdown
Member

LGTM

cpirich added a commit that referenced this pull request Nov 12, 2014
@cpirich
Merge pull request #403 from code-dot-org/editCode_no_blockly
7bf11e6 
don't use Blockly at all on editCode levels
@cpirich cpirich merged commit 7bf11e6 into staging Nov 12, 2014
@cpirich cpirich deleted the editCode_no_blockly branch November 12, 2014 19:19
deploy-code-org added a commit that referenced this pull request Nov 12, 2014
@deploy-code-org
Automatically built.
934b4e6 
commit 7bf11e6
Merge: 25bf787 7d68165
Author: cpirich <chris@code.org>
Date:   Wed Nov 12 11:19:41 2014 -0800

    Merge pull request #403 from code-dot-org/editCode_no_blockly

    don't use Blockly at all on editCode levels

commit 7d68165
Author: cpirich <chris@code.org>
Date:   Wed Nov 12 11:13:20 2014 -0800

    PR feedback: add comments

commit 25bf787
Merge: 8ce5f4c 24c4471
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Nov 12 11:00:22 2014 -0800

    Merge pull request #405 from code-dot-org/functionalNumberDropdown

    new dropdown number block
Bjvanminnen pushed a commit that referenced this pull request Nov 14, 2014
@deploy-code-org
Automatically built.
c14637b 
commit 0c0286d
Merge: 70e8640 74c89e9
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 12 14:42:39 2014 -0800

    merge conflict js files

commit 70e8640
Merge: beb8a4b bf24ae7
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 12 14:36:19 2014 -0800

    merge staging into hoc

commit 74c89e9
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 12 22:31:45 2014 +0000

    Automatically built.

    commit beb8a4b
    Merge: 12fe5bb 9660745
    Author: Brendan Reville <brendan@code.org>
    Date:   Wed Nov 12 14:24:24 2014 -0800

        Merge branch 'hoc' of github.com:code-dot-org/code-dot-private into hoc

    commit 12fe5bb
    Author: Brendan Reville <brendan@code.org>
    Date:   Wed Nov 12 14:23:52 2014 -0800

        Don't support retina pixel ratios other than 2.  (Sorry iPhone 6 Plus!)

commit bf24ae7
Merge: 9d2c262 c3d6ed1
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 12 14:25:17 2014 -0800

    Merge branch 'staging' of https://github.com/code-dot-org/code-dot-org into staging

commit beb8a4b
Merge: 12fe5bb 9660745
Author: Brendan Reville <brendan@code.org>
Date:   Wed Nov 12 14:24:24 2014 -0800

    Merge branch 'hoc' of github.com:code-dot-org/code-dot-private into hoc

commit 12fe5bb
Author: Brendan Reville <brendan@code.org>
Date:   Wed Nov 12 14:23:52 2014 -0800

    Don't support retina pixel ratios other than 2.  (Sorry iPhone 6 Plus!)

commit c3d6ed1
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 12 22:15:12 2014 +0000

    Automatically built.

    commit efa5204
    Author: Josh Lory <josh.lory@code.org>
    Date:   Wed Nov 12 13:51:54 2014 -0800

        Don't check visibility when checking required blocks

        The block could be used in a function, which will make it invisible when
        the function editor isn't open.

commit bb6d726
Merge: fbffb8d 3dce116
Author: Laurel <laurel.fan@gmail.com>
Date:   Wed Nov 12 14:04:50 2014 -0800

    Merge pull request #411 from code-dot-org/pd-teacher-report

    report listing some metrics for each teacher trained by an affiliate

commit 3dce116
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Wed Nov 12 14:03:56 2014 -0800

    report listing some metrics for each teacher trained by an affiliate

commit fbffb8d
Merge: efa5204 fe7ccf3
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 12 13:59:21 2014 -0800

    Merge pull request #410 from code-dot-org/i18n

    page for lead translators

commit fe7ccf3
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 12 13:59:11 2014 -0800

    page for lead translators

commit efa5204
Author: Josh Lory <josh.lory@code.org>
Date:   Wed Nov 12 13:51:54 2014 -0800

    Don't check visibility when checking required blocks

    The block could be used in a function, which will make it invisible when
    the function editor isn't open.

commit dfb9e08
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 12 21:39:58 2014 +0000

    Automatically built.

    commit eeb88d4
    Merge: a6f80e7 0ffc73b
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Wed Nov 12 13:18:45 2014 -0800

        Merge pull request #409 from code-dot-org/calcLBFix

        couple of minor fixes for calc level builder

    commit 0ffc73b
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Wed Nov 12 13:10:08 2014 -0800

        couple of minor fixes for calc level builder

commit 9660745
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 12 21:34:43 2014 +0000

    Automatically built.

    commit 8964119
    Merge: 6b2716f 8236db7
    Author: Brendan Reville <brendan@code.org>
    Date:   Wed Nov 12 13:23:45 2014 -0800

        Merge branch 'hoc' into pngquant

    commit 6b2716f
    Author: Brendan Reville <brendan@code.org>
    Date:   Wed Nov 12 13:22:22 2014 -0800

        pngquant on anna, elsa & scrat.

commit 8964119
Merge: 6b2716f 8236db7
Author: Brendan Reville <brendan@code.org>
Date:   Wed Nov 12 13:23:45 2014 -0800

    Merge branch 'hoc' into pngquant

commit 6b2716f
Author: Brendan Reville <brendan@code.org>
Date:   Wed Nov 12 13:22:22 2014 -0800

    pngquant on anna, elsa & scrat.

commit eeb88d4
Merge: a6f80e7 0ffc73b
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Nov 12 13:18:45 2014 -0800

    Merge pull request #409 from code-dot-org/calcLBFix

    couple of minor fixes for calc level builder

commit 0ffc73b
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Nov 12 13:10:08 2014 -0800

    couple of minor fixes for calc level builder

commit a6f80e7
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 12 20:58:08 2014 +0000

    Automatically built.

    commit bbb83f1
    Merge: abef571 7ca2ca5
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Wed Nov 12 12:35:38 2014 -0800

        Merge pull request #407 from code-dot-org/calcHighlight

        [Finishes #82528294] highlight calc blocks as we evaluate

    commit abef571
    Merge: 4da1943 77a5660
    Author: Tanya Parker <tanyacparker@gmail.com>
    Date:   Wed Nov 12 12:33:30 2014 -0800

        Merge pull request #408 from code-dot-org/hourofcode

        add palestine, africa, and asia pacific pages to hoc.com

commit f75afbc
Merge: bbb83f1 a3f939f
Author: kapone <katie@code.org>
Date:   Wed Nov 12 12:48:06 2014 -0800

    Merge pull request #406 from code-dot-org/morechangestoeducate2

    more copy changes to educate2

commit a3f939f
Author: Katie Apone <katie@code.org>
Date:   Wed Nov 12 12:44:53 2014 -0800

    edited bullet points in educate2

commit bbb83f1
Merge: abef571 7ca2ca5
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Nov 12 12:35:38 2014 -0800

    Merge pull request #407 from code-dot-org/calcHighlight

    [Finishes #82528294] highlight calc blocks as we evaluate

commit abef571
Merge: 4da1943 77a5660
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 12 12:33:30 2014 -0800

    Merge pull request #408 from code-dot-org/hourofcode

    add palestine, africa, and asia pacific pages to hoc.com

commit 77a5660
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 12 12:33:03 2014 -0800

    add palestine, africa, and asia pacific pages to hoc.com

commit 4da1943
Merge: 934b4e6 d6cbde2
Author: Josh Lory <josh.lory@code.org>
Date:   Wed Nov 12 12:29:06 2014 -0800

    Merge pull request #399 from code-dot-org/levelbuilder-callouts

    Add basic callout support to levelbuilder (defined via JSON)

commit d6cbde2
Author: Josh Lory <josh.lory@code.org>
Date:   Wed Nov 12 12:24:47 2014 -0800

    @level.callout_json doesn't exist for e.g. unplugged levels

commit 7ca2ca5
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Nov 12 12:13:11 2014 -0800

    [Finishes #82528294] highlight calc blocks as we evaluate

commit 881e018
Author: Josh Lory <josh.lory@code.org>
Date:   Wed Nov 12 12:05:06 2014 -0800

    Combine seen callouts logic

commit e28c9c8
Author: Katie Apone <katie@code.org>
Date:   Wed Nov 12 12:00:11 2014 -0800

    more copy changes to educate2

commit 15f9c4b
Author: Josh Lory <josh.lory@code.org>
Date:   Wed Nov 12 11:45:12 2014 -0800

    Code review feedback

commit 934b4e6
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 12 19:44:21 2014 +0000

    Automatically built.

    commit 7bf11e6
    Merge: 25bf787 7d68165
    Author: cpirich <chris@code.org>
    Date:   Wed Nov 12 11:19:41 2014 -0800

        Merge pull request #403 from code-dot-org/editCode_no_blockly

        don't use Blockly at all on editCode levels

    commit 7d68165
    Author: cpirich <chris@code.org>
    Date:   Wed Nov 12 11:13:20 2014 -0800

        PR feedback: add comments

    commit 25bf787
    Merge: 8ce5f4c 24c4471
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Wed Nov 12 11:00:22 2014 -0800

        Merge pull request #405 from code-dot-org/functionalNumberDropdown

        new dropdown number block

commit 6038e7f
Author: Josh Lory <josh.lory@code.org>
Date:   Wed Nov 12 11:28:06 2014 -0800

    Add test and fix bug with empty callouts

commit 7bf11e6
Merge: 25bf787 7d68165
Author: cpirich <chris@code.org>
Date:   Wed Nov 12 11:19:41 2014 -0800

    Merge pull request #403 from code-dot-org/editCode_no_blockly

    don't use Blockly at all on editCode levels

commit 7d68165
Author: cpirich <chris@code.org>
Date:   Wed Nov 12 11:13:20 2014 -0800

    PR feedback: add comments

commit 25bf787
Merge: 8ce5f4c 24c4471
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Nov 12 11:00:22 2014 -0800

    Merge pull request #405 from code-dot-org/functionalNumberDropdown

    new dropdown number block

commit 24c4471
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Nov 12 10:54:37 2014 -0800

    new dropdown number block

commit 8ce5f4c
Merge: 82d9f5a 0bf084e
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 12 10:41:18 2014 -0800

    Merge pull request #404 from code-dot-org/hourofcode

    add khanacademy, tfa, and mesa company pages

commit 0bf084e
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 12 10:40:56 2014 -0800

    add khanacademy, tfa, and mesa company pages

commit f6fc4cd
Author: cpirich <chris@code.org>
Date:   Wed Nov 12 09:51:45 2014 -0800

    don't use Blockly at all on editCode levels

commit 82d9f5a
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Nov 12 00:47:37 2014 -0800

    newrelic recipe for chef.

commit d363ef8
Merge: 4acefa9 b45f22b
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Tue Nov 11 23:04:58 2014 -0800

    Merge pull request #400 from code-dot-org/events_button_hotfix

    Moved button one line down.

commit b45f22b
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Tue Nov 11 23:03:40 2014 -0800

    Moved button one line down.

commit 4acefa9
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 11 18:23:33 2014 -0800

    add egypt as hourofcode.com/eg

commit 85b3ff0
Author: Josh Lory <josh.lory@code.org>
Date:   Tue Nov 11 18:04:21 2014 -0800

    Add basic callout support to levelbuilder (defined via JSON)

commit 8236db7
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 12 01:53:44 2014 +0000

    Automatically built.

    commit 68015cc
    Merge: 420b495 d5711ce
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Tue Nov 11 17:46:28 2014 -0800

        Merge pull request #11 from code-dot-org/snowflakes

        add some more prebuilt snowflakes

    commit d5711ce
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Tue Nov 11 17:42:45 2014 -0800

        add some more prebuilt snowflakes

commit 68015cc
Merge: 420b495 d5711ce
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Tue Nov 11 17:46:28 2014 -0800

    Merge pull request #11 from code-dot-org/snowflakes

    add some more prebuilt snowflakes

commit d5711ce
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Tue Nov 11 17:42:45 2014 -0800

    add some more prebuilt snowflakes

commit 14f061e
Merge: 0124f09 221ef07
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 12 01:28:04 2014 +0000

    Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging

commit 221ef07
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 11 17:27:54 2014 -0800

    Revert "Merge branch 'staging' of /Users/brian/code/code-dot-org with conflicts."

    This reverts commit 25dc6f7.

commit 0124f09
Merge: 20d7ac0 fb40b80
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 12 01:27:03 2014 +0000

    Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging

commit 20d7ac0
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 12 01:19:37 2014 +0000

    Dropbox changes

commit fb40b80
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 11 17:14:57 2014 -0800

    Add style file

commit ccd5aa4
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 11 17:02:02 2014 -0800

    Add msm-new curriculum boilerplate

commit 25dc6f7
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 11 14:35:31 2014 -0800

    Merge branch 'staging' of /Users/brian/code/code-dot-org with conflicts.

commit 420b495
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 12 00:23:44 2014 +0000

    Automatically built.

    commit f8eb54a
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Tue Nov 11 15:58:38 2014 -0800

        Fix scrat

commit 0593191
Author: Rick Hawkins <rick@alchemydes.com>
Date:   Tue Nov 11 16:11:05 2014 -0800

    Add http:// to website, if not already there.

commit f8eb54a
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Tue Nov 11 15:58:38 2014 -0800

    Fix scrat

commit 2c7fc30
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 11 15:57:28 2014 -0800

    fix how-to in translations

commit 5aa92c5
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 11 23:52:33 2014 +0000

    Automatically built.

    commit 4ddd9dd
    Merge: 9f901c4 b9f9400
    Author: davidsbailey <davidsbailey@users.noreply.github.com>
    Date:   Tue Nov 11 15:30:42 2014 -0800

        Merge pull request #396 from code-dot-org/levelbuilder-sort-by-visibility

        Arrange start blocks so that hidden blocks do not displace visible ones.

    commit 9f901c4
    Author: Rick Hawkins <rick@alchemydes.com>
    Date:   Tue Nov 11 15:18:18 2014 -0800

        Restored activation of map on click.

    commit 129c015
    Author: Continuous Integration <dev@code.org>
    Date:   Tue Nov 11 23:15:30 2014 +0000

        Dropbox changes

commit 935d53e
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 11 23:46:42 2014 +0000

    Automatically built.

    commit b2c827d
    Merge: 8fd941f ffc4e12
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Tue Nov 11 15:39:21 2014 -0800

        Merge pull request #8 from code-dot-org/cleanup

        Cleanup

    commit ffc4e12
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Mon Nov 10 17:37:57 2014 -0800

        move some scrat logic into its own file

    commit 8fd941f
    Author: Continuous Integration <dev@code.org>
    Date:   Tue Nov 11 09:06:40 2014 +0000

        Automatically built.

        commit 04ffece
        Author: Brendan Reville <brendan@code.org>
        Date:   Tue Nov 11 00:58:41 2014 -0800

            Fix comment.

    commit 04ffece
    Author: Brendan Reville <brendan@code.org>
    Date:   Tue Nov 11 00:58:41 2014 -0800

        Fix comment.

commit b2c827d
Merge: 8fd941f ffc4e12
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Tue Nov 11 15:39:21 2014 -0800

    Merge pull request #8 from code-dot-org/cleanup

    Cleanup

commit 4ddd9dd
Merge: 9f901c4 b9f9400
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Tue Nov 11 15:30:42 2014 -0800

    Merge pull request #396 from code-dot-org/levelbuilder-sort-by-visibility

    Arrange start blocks so that hidden blocks do not displace visible ones.

commit 9f901c4
Author: Rick Hawkins <rick@alchemydes.com>
Date:   Tue Nov 11 15:18:18 2014 -0800

    Restored activation of map on click.

commit 129c015
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 11 23:15:30 2014 +0000

    Dropbox changes

commit 826cd2c
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 11 23:13:50 2014 +0000

    Dropbox changes

commit b9f9400
Author: David Bailey <dsb123@gmail.com>
Date:   Tue Nov 11 15:09:58 2014 -0800

    touch up for levelbuilder-sort-by-visibility

commit b5bd77d
Author: Rick Hawkins <rick@alchemydes.com>
Date:   Tue Nov 11 15:04:44 2014 -0800

    Replace donor information with Twitter feed on csedweek.org.

commit 3a769df
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 11 22:59:43 2014 +0000

    Dropbox changes

commit 2904729
Author: David Bailey <dsb123@gmail.com>
Date:   Tue Nov 11 14:51:45 2014 -0800

    Arrange start blocks so that hidden blocks do not displace visible ones.

commit 80a49f1
Merge: 050fac4 f339544
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 11 14:06:52 2014 -0800

    Merge pull request #395 from code-dot-org/hourofcode

    hourofcode.com handout assets for i18n

commit f339544
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 11 14:06:06 2014 -0800

    remove hoc_uri from file paths of translations

commit 050fac4
Merge: 8102e47 1f91267
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Tue Nov 11 13:53:42 2014 -0800

    Merge pull request #394 from code-dot-org/hoc_all_events_button

    Hoc all events button

commit 1f91267
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Tue Nov 11 13:52:21 2014 -0800

    Added a bottom-margin so that the button would look better on small screens

commit 173305f
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 11 13:48:47 2014 -0800

    hourofcode.com portuguese uses hoc-one-pager-pt
stephenliang pushed a commit that referenced this pull request May 7, 2026
@breville
Merge pull request #403 from code-dot-org/initial-text-to-speech
be6752a 
Initial text to speech support
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@cpirich @davidsbailey