-
Notifications
You must be signed in to change notification settings - Fork 526
store sprite.value again, use it properly in setSpriteSize #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
LGTM |
cpirich
added a commit
that referenced
this pull request
Sep 22, 2014
store sprite.value again, use it properly in setSpriteSize
deploy-code-org
added a commit
that referenced
this pull request
Sep 22, 2014
commit fb1b2d6 Merge: 207e4db 0713f6b Author: cpirich <chris@code.org> Date: Mon Sep 22 12:13:28 2014 -0700 Merge pull request #2 from code-dot-org/fix_setSprite store sprite.value again, use it properly in setSpriteSize commit 207e4db Author: Brian Jordan <bcjordan@gmail.com> Date: Mon Sep 22 12:12:02 2014 -0700 Update README.md
Merged
Bjvanminnen
added a commit
that referenced
this pull request
Nov 14, 2014
[Finishes #81619770] new prebuilts
wjordan
added a commit
that referenced
this pull request
Sep 4, 2015
Rails 4 2 update (extra fixes #2)
deploy-code-org
added a commit
that referenced
this pull request
Sep 4, 2015
commit fe06578 Merge: 4e0de33 fe7e738 Author: Brad Buchanan <bradley.c.buchanan@gmail.com> Date: Fri Sep 4 13:02:13 2015 -0700 Merge pull request #3838 from code-dot-org/netsim-visualization-reset Consult UUIDs when deciding to destroy vizelements. commit fe7e738 Author: Brad Buchanan <brad@code.org> Date: Fri Sep 4 12:38:39 2015 -0700 Better comments. commit 4e0de33 Merge: 24ae4ae 1c955c3 Author: Will Jordan <wjordan@users.noreply.github.com> Date: Fri Sep 4 12:25:55 2015 -0700 Merge pull request #3877 from code-dot-org/rails_4_2_update Rails 4 2 update (extra fixes #2) commit 1c955c3 Author: Will Jordan <will@code.org> Date: Fri Sep 4 12:21:28 2015 -0700 load i18n locales before application fork commit 24ae4ae Merge: 8a999a3 6f3e0a7 Author: Andre Stackhouse <CaptainStack@outlook.com> Date: Fri Sep 4 12:12:26 2015 -0700 Merge pull request #3876 from code-dot-org/automated-workshop-email-reminder-prerequisites Much simpler prerequisite calculation (not using activity_constants)
1 task
bcjordan
added a commit
that referenced
this pull request
Feb 23, 2016
philbogle
added a commit
that referenced
this pull request
Apr 19, 2016
Hamms
added a commit
that referenced
this pull request
May 3, 2016
bcjordan
added a commit
that referenced
this pull request
May 25, 2016
* Test running Circle test against Sauce Labs * Update test * Try adding colons * Try indentation change * Make map params a map * - Decrypt levels - Add sauce labs to locals.yml * Try using full build * Run all tests. - Remove extra seeds/setup * Skip default database seeding * Try to force skipping database step * Update runner to auto-retry * Try 10 parallel tests * Try not double-running grunt tests, even fewer parallel test instances * Set circle tests to "green" mode. Should fix hourOfCode_signedIn.feature—(fixing it from logging out on visits to /hoc/1) * Try 7 parallel instances (will check for out of memory error) * Try 6 parallel instances * Try removing require from steps * Update circle.yml to copy over artifacts. Remove some gems from Gemfile based on bundle_require branch * Remove moreutils and `ts` (moreutils conflicting with parallel used by CircleCI) * Add blank? require * Add time * Require environment for i18n translate - Require konacha in Gemfile again - Include ActiveSupport keygenerator in cookie helpers * Increase # parallel * Try 13 parallel tests * Try 10 parallel * Try 9 tests * Try 8 parallel * Undo gemfile changes * Move require rails env out into own helper * Parallelize across containers * Try running parallel failure in non-parallel * Try removing single quotes * Test adding [run-ui] annotation to run tests * Check for `sudo npm` on Linux [run-ui] - Fix alias yaml syntax * Fix node reference (might be circular now?) * Use `which node` for symlink * Undo node changes, use npm_use_sudo: false * Update to do initial database setup * Build code studio, explicitly run apps tests using npm test * Update instance node version * Try building only if files changed (may skip many tests). [run-ui-tests] * Use script for [run-ui-tests] * Fix location * Add new cache location [run-ui-tests] * Move UI test skipping logic into Rakefile :circle namespace [ui test] * New test rake tasks [test all] [test ui] * Add system background helper, fix ./bin/sc command * Fix rake param name [test ui] [test all] * Try using system_with_hipchat_logging to get output on success * Bump file [test ui] [test all] * Fix indentation - Collapse single settings - Add longer timeout for long-running tests scripts with little output * Bump for test run [test ui] [test all] * Attempt to fix circle.yml formatting * Attempt to fix circle.yml formatting #2 [test ui] [test all] * Try using new system commands * Bump for test [test ui] * Fix timeout usage of rails helpers * Use magic-retry for test rerun [test ui] * Bump to test everything [test all] * Move setup steps into dependencies phase so caching occurs. * Fix up system command to not print 2>&1 for quiet commands * Force development dependency installation [test ui] * Try using --with [test ui] * Try using --without '' [test ui] * Try using 4 parallel [test ui] * Try removing development exclusion after rake install * Try also bundle installing after bundle config removal * Move bundle install to end [test ui] * Only use rerun when development [test all] [test ui] * Try removing ./bin/dashboard-server (already auto-running?) [test all] [test ui] - Remove redundant DB steps * Move set_hoc_flags to after DB setup [test all] [test ui] * Move hoc flag comment * Add back dashboard server [test ui] * Try without set_hoc_flags [test all] [test ui] * Set hoc flags to green (don't require login for star wars et al) [test all] [test ui] * Try adding script.id log [test all] * More debug calls [test all] * Try running dashboard with rails/rack env set [test ui] * Try flipping order [grab scripts on test time] [test all] [test ui] * Try seeding between unit tests and UI tests [test all] [test ui] * Fix typo [test ui] [test all] * Localize apps. Retry 4 times. [test ui] [test all] * Fix script test. Add explanation to re-seeding. [test all] [test ui] * Remove assets/sources s3 directory overrides [test all] [test ui] * Add @no_circle annotation. Run without @no_circle tests when running UI tests via Circle [test ui] [test all] * Extract circle.rake, test.rake. Move git utilities into GitUtils. - Determine base branch through a mapping * Fix spacing , force test run. [test ui] [test all] * Reflect moved method * Force test [test all] [test ui] * Update grunt-sass to potentially fix circleci failure Potential fix for issue: `Error: The `libsass` binding was not found in [CDO]/apps/node_modules/grunt-sass/node_modules/node-sass/vendor/linux-x64-14/binding.node` * Bump file with whitespace change to force circle test [test ui] [test all] * Introduce whitespace change to trigger build [test all] [test ui] * 16 tests in parallel [test ui] * Skip tests with circle issues [test ui] * Try 30 parallel [test ui] * Try 20 parallel [test ui] * Try 40 in parallel [test all] [test ui] * Update to stream output. Try 30 parallel. [test ui] [test all] * Test adding hipchat logging for failures [test ui] [test all] * Include format_duration (dupication) temporarily [test ui] [test all] * Pull out multiple definitions of `format_duration` to `RakeUtils.format_duration` [test all] [test ui] * Pull *stream_output commands into RakeUtils (aliasing the original "system" command). [test all] [test ui] * Merge remote-tracking branch 'origin/staging' into sauce-circle-fast [test all] [test ui] * Try different logging, see if shows up in circleci output [test all] [test ui] * Properly use original system [test all] [test ui] * Use correct way of aliasing methods [test all] [test ui] * Fix streaming command exit status output [test all] [test ui] * Try magic retry [test all] [test ui] * Back to retry count (memory usage effect?) [test all] [test ui] * Try with 35 parallel [test all] [test ui] * Remove test logging, remove duplicate "Running " from strings [test all] [test ui] * Move tag definitions out of circle.yml parameters and into circle.rake as constants [test ui] [test all] * Add explanation of rake utils system command aliasing. * Remove unused helper file [test all] [test ui] * Try latest sauce connect [test ui] * Try latest sauce connect (correct unzip) [test ui] * Try adding no_circle to free response submittable [test ui] * Update documentation [test ui] [test all] * Add ? to fnmatch. [test all] * Use Kernel.system rather than aliasing. $?.exitstatus -> $?.success? [test all] * Include apps in code-studio testing dependencies * Undo unintentional change from merge * Change diff detection glob behavior. Add git utils test. * Move glob_matches_file_path? into rake_utils * Fix reference. Add lib/* to shared test triggers. * Fix changed PR file detection method. * Make changed file output a bit easier to scan. * Try using origin/
caleybrock
added a commit
that referenced
this pull request
Aug 1, 2016
8 tasks
This was referenced Jan 24, 2024
Closed
snickell
added a commit
that referenced
this pull request
Feb 3, 2024
This was referenced Feb 5, 2024
Closed
Closed
8 tasks
8 tasks
8 tasks
vijayamanohararaj
added a commit
that referenced
this pull request
May 8, 2024
8 tasks
8 tasks
fisher-alice
added a commit
that referenced
this pull request
Feb 3, 2025
8 tasks
8 tasks
8 tasks
bencodeorg
added a commit
that referenced
this pull request
Aug 4, 2025
bencodeorg
added a commit
that referenced
this pull request
Aug 4, 2025
… on submit button" This reverts commit 76d845e.
bencodeorg
added a commit
that referenced
this pull request
Aug 4, 2025
* Add submittable to weblab2, simplify logic for showing submittable view * Approach #1: set hasRun to true in Web Lab 2 * Approach #2: add another explicit prop for skipping run check on submit button * Revert "Approach #2: add another explicit prop for skipping run check on submit button" This reverts commit 76d845e.
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A recent change broke setSpriteSize. setSprite used to store the value in sprite.value. That was useful so setSpriteSize() could call back into setSprite() with the same value as was previously set.
I restored the code that stores sprite.value.
And I added a conditional check in setSpriteSize() to avoid calling setSprite() when the sprite is hidden. The command will still work (so you can change the size before you set the image), but there is no need to execute all of the code in setSprite() unless the sprite is visible.
TODO: add a test case for setSpriteSize() so this doesn't happen again in the future :)