Fix macos ctrl context menus on mute addon - #1925
Merged
Merged
Conversation
Contributor
|
i test and it doesn't work |
Member
Author
|
Test now, we just fixed a bug. |
Member
Author
Contributor
|
Ok |
Contributor
|
I'll test later |
Contributor
|
it works but if you hold the control key for a while it will show the context menu 2564-03-20.07.54.53.mov |
scratchusernamemrtbts
approved these changes
Mar 20, 2021
Member
|
You sure you are running this branch and not the master? |
Contributor
|
yes |
TheColaber
approved these changes
Mar 21, 2021
Contributor
|
@Hans5958 merge? |
Member
|
Not my part here. @WorldLanguages |
| ctrlPressedRecently = true; | ||
| setTimeout(() => { | ||
| if (pressCount === ctrlPressesCount) ctrlPressedRecently = false; | ||
| }, 2500); |
Member
There was a problem hiding this comment.
We might want to lower this to less than 2.5 seconds, but in that case Alt+GreenFlag for 60FPS should also be updated, so better to do in a separate PR if someone is interested.
GrahamSH-LLK
added a commit
that referenced
this pull request
Apr 1, 2021
* Bug fixes & code splitting Fix bugs I introduced Split up * style: format code * More changes * style: format code * Unified popup base css! * style: format code * Remove unneeded css * style: format code * Preload light.css * style: format code * Lower fouc * [pull] master from ScratchAddons:master (#203) * New strings from Transifex (#1908) Co-authored-by: scratchaddons-bot[bot] <73682299+scratchaddons-bot[bot]@users.noreply.github.com> * Better color picker for settings page (#1781) * Init * Removefile * style: format code * Popper, performance, and other changes * style: format code * Fix merge bug * style: format code * Changes * style: format code * Fixes * No_popper * style: format code * Better transparency styling * style: format code * Light and dark modes! * style: format code * Match transparency gradients * Slightly hacky fix for click outside * style: format code * Radius fix * Proper library licensing * style: format code * Remove auto-close for now... * Fixes * style: format code * Fixes * Forked build, non-transparent * style: format code * 5 char change to mimic input[type=color] * Sync thumb thingu * style: format code * Fix * Update on drag * Fix linted changes * style: format code * Non-transparent version * style: format code * Fix self * style: format code * Changes * style: format code * Fixes * Update CREDITS.md * one element * style: format code * Fix W_L's nitpicking Co-authored-by: GrahamSH-LLK <GrahamSH-LLK@users.noreply.github.com> * New Addon - 2D Color Picker! (#1768) * add the addon bruh lol * Ran Prettier. Added beta tag * h h * use addon.tab.scratchClass * localization idk if i did this correctly * bruh * aaaaaaaaaaaaaaaaaaaaaaaaaaa * Update 2d-color-picker.json * Update addon.json * Fixed Shift functionality and added real-time color update! * we do a little trolling * scratch class * Better description Co-authored-by: WorldLanguages <mundofinky@gmail.com> * New addon - custom block shape (#1773) * Create addon.json * Update addons.json * Add files via upload * Update addon.json * Rename * Update addon.json * Update userscript.js * Adjustments before PR * Some adjustments * Add corner option and fix notches * Working corner size option * style: format code * Fixed up boolean issues * style: format code * Added notch height option * style: format code * Storing for later * style: format code * Fixed dropdowns and added higher padding cap * Added presets, internal clean-up * style: format code * Changing padding now properly updates workspace * Fix define hat corner issue * style: format code * Flyout partially updates on setting change * style: format code * Fixed C/E block corner issues * style: format code * Flyout now updates correctly * Gave GarboMuffin much-deserved credit * Suggested changes from GarboMuffin * GarboMuffin editor refresh fix and suggested changes from RedGuy12 * Fixed corner path start position * style: format code * Remove beta tag Co-authored-by: lisa-wolfgang <lisa-wolfgang@users.noreply.github.com> Co-authored-by: WorldLanguages <mundofinky@gmail.com> * Add error when scratchdb is down (#1830) * Update userscript.js * style: format code * Update scratchstats.json * Restore userscript.js * Update userscript.js * style: format code Co-authored-by: RedGuy12 <RedGuy12@users.noreply.github.com> * scratchblocks scroll (#1831) * Update addon.json * Create blocks.css * Update blocks.css * Update addon.json * style: format code * Update addon.json * Update addon.json Co-authored-by: RedGuy12 <RedGuy12@users.noreply.github.com> * Make profile page banner less blurry (#1889) * Make profile page banner less blurry * Add blur * Clarify setting name "blur" Co-authored-by: WorldLanguages <mundofinky@gmail.com> * Bump to v1.12.0-prerelease (#1911) * New strings from Transifex (#1913) Co-authored-by: scratchaddons-bot[bot] <73682299+scratchaddons-bot[bot]@users.noreply.github.com> * Fix some bugs in editor-devtools (#1919) * Fix lint error in 2d-color-picker * editor-devtools: fix capitalization * editor-devtools: do not show send to top in sounds * support cmd key (#1923) * Revert "support cmd key (#1923)" (#1924) This reverts commit 0118d28. * Fix anti-zalgo code (#1912) * New strings from Transifex (#1927) Co-authored-by: scratchaddons-bot[bot] <73682299+scratchaddons-bot[bot]@users.noreply.github.com> * New strings from Transifex (#1929) Co-authored-by: scratchaddons-bot[bot] <73682299+scratchaddons-bot[bot]@users.noreply.github.com> * Drag and drop files into the editor (#1916) * Drag and drop files into the targets pane * Make the costume, sound, and backdrop selector areas also file-droppable * Show blue highlight when dragging a file over a drop area * Fix losing drop area after switching between project and editor page... ...and add l10n: true * Change descriptions, add "recommended" tag Co-authored-by: WorldLanguages <mundofinky@gmail.com> * Fix macos ctrl context menus on mute addon (#1925) * Update userscript.js * style: format code * fix bug Co-authored-by: GrahamSH-LLK <GrahamSH-LLK@users.noreply.github.com> Co-authored-by: TheColaber <72760579+TheColaber@users.noreply.github.com> * New strings from Transifex (#1933) Co-authored-by: scratchaddons-bot[bot] <73682299+scratchaddons-bot[bot]@users.noreply.github.com> * Dango Day Easter Egg (#1931) * init commit * style: format code * why did i do this?? * style: format code * forgot to / 1000 * Settings page: hide by default if not april fools * style: format code * Localize, fix CSS, add close button, remove unnecessary bitwise OR * style: format code * Credit Twemoji * one char bug fix * Update manifest * Avoid "poof" if disabled * Fix typo * Remove fix unrelated to this PR * Better logic on whether to show this addon, fix addon poofing (#1932) * style: format code * Remove unused CSS * Make check for "dango" case insensitive * Make it work in all 4 situations * Only run on profiles (not in /followers etc) Co-authored-by: TheColaber <TheColaber@users.noreply.github.com> Co-authored-by: WorldLanguages <mundofinky@gmail.com> Co-authored-by: WorldLanguages <WorldLanguages@users.noreply.github.com> * New strings from Transifex (#1946) Co-authored-by: scratchaddons-bot[bot] <73682299+scratchaddons-bot[bot]@users.noreply.github.com> * Fix #1945 (#1947) * Fix #1945 * Allow uploading entire folders at once * Formatting * Fix verifyBackpack check * New strings from Transifex (#1957) Co-authored-by: scratchaddons-bot[bot] <73682299+scratchaddons-bot[bot]@users.noreply.github.com> * Use Comlink instead of `template#scratch-addons`, stop spamming contentScriptInfo (#1928) * Use comlink, stop spamming contentScriptInfo * style: format code * Remove debugger; * Fix typo * Add Comlink to libraries * Upload non-linted Comlink (from unpkg) * Add comlink to libraries/CREDITS.md * setMsgCount message: send object instead of integer directly * Remove chrome.tabs.sendMessage debugging trap * Remove window.onmessage debugging event * style: format code * Complete csInfoCache logic * style: format code * Fix todo * Fix todo 2 * Fix todo 3 * Clarify todo 4 * Fix todo 5 Co-authored-by: WorldLanguages <WorldLanguages@users.noreply.github.com> * Migrate scratchstats "followers over time" to ScratchDBv3 (#1955) * Migrate scratchstats "followers over time" to ScratchDBv3 * style: format code Co-authored-by: WorldLanguages <WorldLanguages@users.noreply.github.com> * Reorder CS logic (#1958) * Fix lint (#1959) * Fix lint * style: format code Co-authored-by: apple502j <apple502j@users.noreply.github.com> * Custom block shape semicolon "fix" (#1960) * Fixed semicolon "glitch" for apple * style: format code Co-authored-by: lisa-wolfgang <lisa-wolfgang@users.noreply.github.com> * v1.12.0 update notification, set new addons (#1964) * v1.12.0 update notification, set new addons, mark old new addons as recommended * Compress gif (-46%) * New strings from Transifex (#1966) Co-authored-by: scratchaddons-bot[bot] <73682299+scratchaddons-bot[bot]@users.noreply.github.com> * Danger PR checks (#1941) * Create danger.yml * Create dangerfile.js * style: format code * Update dangerfile.js * Update dangerfile.js * style: format code * Update dangerfile.js * Update dangerfile.js * Update dangerfile.js * style: format code * Update danger.yml * Update danger.yml * Update dangerfile.js * style: format code * Update dangerfile.js * style: format code * Update danger.yml * Update dangerfile.js * style: format code * Update danger.yml * Update dangerfile.js * Update dangerfile.js * style: format code * Update dangerfile.js * Fixes * Fix * style: format code * Message * Del/additons * Changes * style: format code * Update dangerfile.js * style: format code * Update dangerfile.js * style: format code * Update danger.yml * Delete package.json * Delete package-lock.json * Update danger.yml * Update dangerfile.js * Update dangerfile.js * style: format code * Update dangerfile.js * style: format code * Update dangerfile.js * style: format code * Update danger.yml * Update danger.yml * Update dangerfile.js * UPGRADE danger * Update danger.yml * Update danger.yml * Rename dangerfile.js to .github/dangerfile.js Co-authored-by: GrahamSH-LLK <GrahamSH-LLK@users.noreply.github.com> * Allow setting variable names in Var Manager Addon (#1951) * init * style: format code Co-authored-by: TheColaber <TheColaber@users.noreply.github.com> Co-authored-by: scratchaddons-bot[bot] <73682299+scratchaddons-bot[bot]@users.noreply.github.com> Co-authored-by: GrahamSH <64214252+GrahamSH-LLK@users.noreply.github.com> Co-authored-by: GrahamSH-LLK <GrahamSH-LLK@users.noreply.github.com> Co-authored-by: Ucrash <35695734+GDUcrash@users.noreply.github.com> Co-authored-by: WorldLanguages <mundofinky@gmail.com> Co-authored-by: lisa-wolfgang <43426138+lisa-wolfgang@users.noreply.github.com> Co-authored-by: lisa-wolfgang <lisa-wolfgang@users.noreply.github.com> Co-authored-by: Paul Reid <paul@reid-family.org> Co-authored-by: RedGuy12 <RedGuy12@users.noreply.github.com> Co-authored-by: Maximouse <51849865+mxmou@users.noreply.github.com> Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com> Co-authored-by: meepooh <66320961+scratchusernamemrtbts@users.noreply.github.com> Co-authored-by: easrng <easrng@gmail.com> Co-authored-by: Sean <ussa.say@gmail.com> Co-authored-by: TheColaber <72760579+TheColaber@users.noreply.github.com> Co-authored-by: TheColaber <TheColaber@users.noreply.github.com> Co-authored-by: WorldLanguages <WorldLanguages@users.noreply.github.com> Co-authored-by: GarboMuffin <33787854+GarboMuffin@users.noreply.github.com> Co-authored-by: apple502j <apple502j@users.noreply.github.com> Co-authored-by: GrahamSH <grahamshllk@gmail.com> * Wanna test something * Remove file that is useless with proper css * Compress additional svg * Add xmlns back just in case * Compress svgs even more * Revert "Compress svgs even more" This reverts commit efa42fd. * Move imports for 🌟 speed 🌟 * style: format code * Fix permissions * More general cleanup * Clean up setting inputs * style: format code * Fix media Co-authored-by: GrahamSH-LLK <GrahamSH-LLK@users.noreply.github.com> Co-authored-by: pull[bot] <39814207+pull[bot]@users.noreply.github.com> Co-authored-by: scratchaddons-bot[bot] <73682299+scratchaddons-bot[bot]@users.noreply.github.com> Co-authored-by: Ucrash <35695734+GDUcrash@users.noreply.github.com> Co-authored-by: WorldLanguages <mundofinky@gmail.com> Co-authored-by: lisa-wolfgang <43426138+lisa-wolfgang@users.noreply.github.com> Co-authored-by: lisa-wolfgang <lisa-wolfgang@users.noreply.github.com> Co-authored-by: Paul Reid <paul@reid-family.org> Co-authored-by: RedGuy12 <RedGuy12@users.noreply.github.com> Co-authored-by: Maximouse <51849865+mxmou@users.noreply.github.com> Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com> Co-authored-by: meepooh <66320961+scratchusernamemrtbts@users.noreply.github.com> Co-authored-by: easrng <easrng@gmail.com> Co-authored-by: Sean <ussa.say@gmail.com> Co-authored-by: TheColaber <72760579+TheColaber@users.noreply.github.com> Co-authored-by: TheColaber <TheColaber@users.noreply.github.com> Co-authored-by: WorldLanguages <WorldLanguages@users.noreply.github.com> Co-authored-by: GarboMuffin <33787854+GarboMuffin@users.noreply.github.com> Co-authored-by: apple502j <apple502j@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Resolves
Resolves #1891
Changes
Fixes bug
Reason for changes
Bugs
Tests
Untested