Skip to content

[Finishes #95928060] Drag elements in design mode#3018

Merged
Bjvanminnen merged 6 commits into
stagingfrom
dragElements
Jul 6, 2015
Merged

[Finishes #95928060] Drag elements in design mode#3018
Bjvanminnen merged 6 commits into
stagingfrom
dragElements

Conversation

@Bjvanminnen

@Bjvanminnen Bjvanminnen commented Jul 2, 2015

Copy link
Copy Markdown
Contributor

dragelements

When dragging elements in design mode, the object we drag should look like what we're going to drop (rather than the toolbox item). The main challenge here was getting it to look the same when at different scales.

The other challenge was making it so that our cursor was in a reasonable place. At first when dragging a radio button the, radio button ended up a bunch to the left of the cursor. The fix was to use cursorAt.

joshlory
joshlory reviewed Jul 2, 2015
View reviewed changes
Comment thread apps/src/applab/designElements/library.js Outdated

@joshlory joshlory Jul 2, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Optional param?

@joshlory

joshlory commented Jul 2, 2015

Copy link
Copy Markdown
Contributor

LGTM!

Bjvanminnen added a commit that referenced this pull request Jul 6, 2015
@Bjvanminnen
Merge pull request #3018 from code-dot-org/dragElements
c713990 
[Finishes #95928060] Drag elements in design mode
@Bjvanminnen Bjvanminnen merged commit c713990 into staging Jul 6, 2015
@Bjvanminnen Bjvanminnen deleted the dragElements branch July 6, 2015 16:19
deploy-code-org added a commit that referenced this pull request Jul 6, 2015
@deploy-code-org
Automatically built.
00ae30f 
commit c713990
Merge: 7813112 c95edef
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Mon Jul 6 09:19:03 2015 -0700

    Merge pull request #3018 from code-dot-org/dragElements

    [Finishes #95928060] Drag elements in design mode

commit 7813112
Author: Josh Lory <josh.lory@code.org>
Date:   Fri Jul 3 17:30:49 2015 -0700

    Temporarily turn off incremental seed

    Fixes video_key on External levels for Monday CSP PD.

commit c95edef
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Jul 2 16:46:52 2015 -0700

    optional param

commit 68529a4
Author: Continuous Integration <dev@code.org>
Date:   Thu Jul 2 23:46:03 2015 +0000

    Automatically built.

    commit 232ad5e
    Merge: 9ad61cd 5b2cd1d
    Author: Continuous Integration <dev@code.org>
    Date:   Thu Jul 2 23:36:44 2015 +0000

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

commit 232ad5e
Merge: 9ad61cd 5b2cd1d
Author: Continuous Integration <dev@code.org>
Date:   Thu Jul 2 23:36:44 2015 +0000

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

commit 5b2cd1d
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Jul 2 16:38:30 2015 -0700

    allow backspace on number inputs

commit 8f9531b
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Jul 2 16:11:17 2015 -0700

    address some cross browser issues
laurelfan pushed a commit that referenced this pull request Jul 6, 2015
@deploy-code-org @laurelfan
Automatically built.
f2f0eb4 
commit c713990
Merge: 7813112 c95edef
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Mon Jul 6 09:19:03 2015 -0700

    Merge pull request #3018 from code-dot-org/dragElements

    [Finishes #95928060] Drag elements in design mode

commit 7813112
Author: Josh Lory <josh.lory@code.org>
Date:   Fri Jul 3 17:30:49 2015 -0700

    Temporarily turn off incremental seed

    Fixes video_key on External levels for Monday CSP PD.

commit c95edef
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Jul 2 16:46:52 2015 -0700

    optional param

commit 68529a4
Author: Continuous Integration <dev@code.org>
Date:   Thu Jul 2 23:46:03 2015 +0000

    Automatically built.

    commit 232ad5e
    Merge: 9ad61cd 5b2cd1d
    Author: Continuous Integration <dev@code.org>
    Date:   Thu Jul 2 23:36:44 2015 +0000

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

commit 232ad5e
Merge: 9ad61cd 5b2cd1d
Author: Continuous Integration <dev@code.org>
Date:   Thu Jul 2 23:36:44 2015 +0000

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

commit 5b2cd1d
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Jul 2 16:38:30 2015 -0700

    allow backspace on number inputs

commit 8f9531b
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Jul 2 16:11:17 2015 -0700

    address some cross browser issues
deploy-code-org added a commit that referenced this pull request Jul 6, 2015
@deploy-code-org
Automatically built.
e59b18c 
commit 6ad6441
Merge: fac267e 562c1da
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Mon Jul 6 11:29:45 2015 -0700

    Merge pull request #2992 from code-dot-org/apps-digest

    Add digest to js files in the apps package

commit fac267e
Merge: 00ae30f d7e92da
Author: Laurel <laurel.fan@gmail.com>
Date:   Mon Jul 6 10:44:36 2015 -0700

    Merge pull request #3022 from code-dot-org/poste

    change Poste Stats/Opens/Clicks to load data for only one mail to mak…

commit d7e92da
Author: Laurel Fan <laurel@code.org>
Date:   Mon Jul 6 10:45:20 2015 -0700

    change Poste Stats/Opens/Clicks to load data for only one mail to make it fast enough to actually load in prod

commit 00ae30f
Author: Continuous Integration <dev@code.org>
Date:   Mon Jul 6 16:26:53 2015 +0000

    Automatically built.

    commit c713990
    Merge: 7813112 c95edef
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Mon Jul 6 09:19:03 2015 -0700

        Merge pull request #3018 from code-dot-org/dragElements

        [Finishes #95928060] Drag elements in design mode

    commit 7813112
    Author: Josh Lory <josh.lory@code.org>
    Date:   Fri Jul 3 17:30:49 2015 -0700

        Temporarily turn off incremental seed

        Fixes video_key on External levels for Monday CSP PD.

    commit c95edef
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Thu Jul 2 16:46:52 2015 -0700

        optional param

    commit 68529a4
    Author: Continuous Integration <dev@code.org>
    Date:   Thu Jul 2 23:46:03 2015 +0000

        Automatically built.

        commit 232ad5e
        Merge: 9ad61cd 5b2cd1d
        Author: Continuous Integration <dev@code.org>
        Date:   Thu Jul 2 23:36:44 2015 +0000

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

    commit 232ad5e
    Merge: 9ad61cd 5b2cd1d
    Author: Continuous Integration <dev@code.org>
    Date:   Thu Jul 2 23:36:44 2015 +0000

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

    commit 5b2cd1d
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Thu Jul 2 16:38:30 2015 -0700

        allow backspace on number inputs

    commit 8f9531b
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Thu Jul 2 16:11:17 2015 -0700

        address some cross browser issues

commit c713990
Merge: 7813112 c95edef
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Mon Jul 6 09:19:03 2015 -0700

    Merge pull request #3018 from code-dot-org/dragElements

    [Finishes #95928060] Drag elements in design mode

commit 7813112
Author: Josh Lory <josh.lory@code.org>
Date:   Fri Jul 3 17:30:49 2015 -0700

    Temporarily turn off incremental seed

    Fixes video_key on External levels for Monday CSP PD.

commit c95edef
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Jul 2 16:46:52 2015 -0700

    optional param

commit 68529a4
Author: Continuous Integration <dev@code.org>
Date:   Thu Jul 2 23:46:03 2015 +0000

    Automatically built.

    commit 232ad5e
    Merge: 9ad61cd 5b2cd1d
    Author: Continuous Integration <dev@code.org>
    Date:   Thu Jul 2 23:36:44 2015 +0000

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

commit 232ad5e
Merge: 9ad61cd 5b2cd1d
Author: Continuous Integration <dev@code.org>
Date:   Thu Jul 2 23:36:44 2015 +0000

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

commit 5b2cd1d
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Jul 2 16:38:30 2015 -0700

    allow backspace on number inputs

commit 8f9531b
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Jul 2 16:11:17 2015 -0700

    address some cross browser issues

commit 9ad61cd
Author: Continuous Integration <dev@code.org>
Date:   Thu Jul 2 23:17:04 2015 +0000

    dropbox and gsheet changes

commit 562c1da
Author: Josh Lory <josh.lory@code.org>
Date:   Thu Jul 2 15:38:19 2015 -0700

    Code review feedback [ci skip]

commit dbb4331
Merge: 6bda798 5246473
Author: Brendan Reville <brendan@code.org>
Date:   Thu Jul 2 15:28:03 2015 -0700

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

commit 6bda798
Author: Brendan Reville <brendan@code.org>
Date:   Thu Jul 2 15:27:37 2015 -0700

    Adjust /promote state counts and texts.

commit bdbbeb7
Author: Josh Lory <josh.lory@code.org>
Date:   Thu Jul 2 15:04:21 2015 -0700

    Get `grunt dev` working without asset fingerprints

    [ci skip]
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

@Bjvanminnen @joshlory