Skip to content

Commit

Permalink
[3851] - Fix multi-mouse bug on block creation and collaboration link…
Browse files Browse the repository at this point in the history
… text (#3967)

* fixes #3913

* fix:resolves grid position on hamburger opening(#3914) (#3924)

* fix:resolves hamburger opening(#3914)

* fix:fixes #3914(suggested changes done)

* adjust size of grid element repositioning when using aux toolbar

---------

Co-authored-by: Walter Bender <walter@sorcero.com>

* Fix input boxes (#3927)

* bump version

* enhancement: scale on hover (#3926)

Co-authored-by: anas2357 <141234155+anas2357@users.noreply.github.com>

* calculate frequencies from ratio

* Add close button to extended-menu pie menu (fixes #3933) (#3934)

* Bump braces and gulp (#3903)

Bumps [braces](https://github.com/micromatch/braces) to 3.0.3 and updates ancestor dependency [gulp](https://github.com/gulpjs/gulp). These dependencies need to be updated together.


Updates `braces` from 2.3.2 to 3.0.3
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/commits/3.0.3)

Updates `gulp` from 4.0.2 to 5.0.0
- [Release notes](https://github.com/gulpjs/gulp/releases)
- [Changelog](https://github.com/gulpjs/gulp/blob/master/CHANGELOG.md)
- [Commits](gulpjs/gulp@v4.0.2...v5.0.0)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
- dependency-name: gulp
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* add support for solfege accidentals in phrasemaker

* Add support for cents (#3937)

* add support for cents through semi-tone transposition

* add 50 cents macro

* add cents example

* add output frequencies

* fix issue with ratio cents

* add a ratio-cents example

* Ratio transpose and Ratio interval (#3936)

* use processPitch for all pitch types

* Add support for cents (#3937)

* add support for cents through semi-tone transposition

* add 50 cents macro

* add cents example

* add output frequencies

* fix issue with ratio cents

* add a ratio-cents example

* use processPitch for all pitch types

* convert freq to note before scalar step

* fix note convert

* remove extra comma throwing off indexing

* Hyperscore link update (#3939) (#3947)

* Update Hyperscore example link in guide.html (#3944)

* Update README.md (#3943)

* left_and_back_images (#3950)

* Updated Dockerfile  (#3949)

* Update README.md

* Update dockerfile

* remove yjs and socket.io dependecies

* Fixed #3956 Auto increasing and decreasing input block (#3957)

* fixes #3941

* fixes #3958

* Fixes collapsed state of note block (#3961)

* fixes issue with extra line number in JavaScript Editor (#3962)

* fixes sample block duplication issue (#3965)

* fixes sample block duplication issue

* changed error message

* updated error message

* Fix multi-mouse bug

* Fix collab link text

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Walter Bender <walter@sorcero.com>
Co-authored-by: Nikhil <154296996+BeNikk@users.noreply.github.com>
Co-authored-by: Anas <141234155+Anas-2357@users.noreply.github.com>
Co-authored-by: anas2357 <141234155+anas2357@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Walter Bender <walter@sugarlabs.org>
Co-authored-by: Harshit Verma <therealharshit014@gmail.com>
Co-authored-by: Geeten Parab <147247925+GeetenParab@users.noreply.github.com>
Co-authored-by: akilesh1706 <126157319+akilesh1706@users.noreply.github.com>
Co-authored-by: Khadar vali <124120102+khadar1020@users.noreply.github.com>
Co-authored-by: Muhammad Haroon <104259212+haroon10725@users.noreply.github.com>
  • Loading branch information
12 people authored Aug 10, 2024
1 parent 4b3759c commit 77ca477
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 22 deletions.
39 changes: 21 additions & 18 deletions js/activity.js
Original file line number Diff line number Diff line change
Expand Up @@ -567,24 +567,27 @@ class Activity {
// this.doLoadAnimation();
this.blocks.isLocalUpdate = false;

// Render the blocks
for (const name in this.palettes.dict) {
this.palettes.dict[name].hideMenu(true);
}

this.stage.removeAllEventListeners("trashsignal");

// Wait for the old blocks to be removed.
// eslint-disable-next-line no-unused-vars
const __listener = (event) => {
this.blocks.loadNewBlocks(data);
setTimeout(() => {
// Render the blocks
for (const name in this.palettes.dict) {
this.palettes.dict[name].hideMenu(true);
}

this.stage.removeAllEventListeners("trashsignal");
};

// Wait for the old blocks to be removed.
// eslint-disable-next-line no-unused-vars
const __listener = (event) => {
this.blocks.loadNewBlocks(data);
this.stage.removeAllEventListeners("trashsignal");
};

this.stage.addEventListener("trashsignal", __listener, false);
this.sendAllToTrash(false, false);
this._allClear(false);
this.refreshCanvas();
}, 500)

this.stage.addEventListener("trashsignal", __listener, false);
this.sendAllToTrash(false, false);
this._allClear(false);
this.refreshCanvas();
};

/**
Expand Down Expand Up @@ -5935,10 +5938,10 @@ class Activity {

if (room_id) {
this.room_id = room_id;
this.textMsg(`_("Collaboration link: ") ${collabUrl}`);
this.textMsg(`${_("Collaboration link: ")} ${collabUrl}`);
this._initiateCollaboration(this.room_id);
};
}, 7000);
}, 5000);
/*
document.addEventListener("mousewheel", scrollEvent, false);
document.addEventListener("DOMMouseScroll", scrollEvent, false);
Expand Down
4 changes: 0 additions & 4 deletions js/collaboration/collaboration.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,10 @@ class Collaboration {
});

socket.on("new-block-added", (update) => {
this.activity.textMsg("New block added. rendering...");
setTimeout(this.activity.hideMsgs, 10000);
this.activity.renderProjectFromData(update);
});

socket.on("new-block-deleted", (update) => {
this.activity.textMsg("New block deleted. rendering...");
setTimeout(this.activity.hideMsgs, 10000);
this.activity.renderProjectFromData(update);
});

Expand Down

0 comments on commit 77ca477

Please sign in to comment.