Skip to content
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

Collaborator cursors #2139

Merged
merged 7 commits into from May 25, 2017
Merged

Conversation

@ian-r-rose
Copy link
Member

@ian-r-rose ian-r-rose commented May 2, 2017

Adds rendering of collaborator cursors to the codemirror instances. In general, it is a lot easier to add a cursor marker than to remove one, so they tend to pile up. I have tried to be pretty aggressive in removing them, but there are still places where we can cull them even more.

cc @cameronoelsen

@ian-r-rose
Copy link
Member Author

@ian-r-rose ian-r-rose commented May 2, 2017

Example:
cursors

@ellisonbg
Copy link
Contributor

@ellisonbg ellisonbg commented May 2, 2017

@ian-r-rose
Copy link
Member Author

@ian-r-rose ian-r-rose commented May 2, 2017

Sure, no problem. I suspect this should be mostly orthogonal to the cell factory changes, though.

@ellisonbg
Copy link
Contributor

@ellisonbg ellisonbg commented May 4, 2017

My branch is merged, rebase needed...;-)

@ian-r-rose ian-r-rose force-pushed the collaborator_cursors branch from 26323ea to fc1d6f0 May 19, 2017
@ian-r-rose ian-r-rose force-pushed the collaborator_cursors branch from fc1d6f0 to 203417a May 24, 2017
@ian-r-rose ian-r-rose changed the title [WIP] Collaborator cursors Collaborator cursors May 24, 2017
@ian-r-rose
Copy link
Member Author

@ian-r-rose ian-r-rose commented May 25, 2017

This should be ready for a look.

signal: this.model.contentChanged,
timeout: RENDER_TIMEOUT
});
this._monitor.activityStopped.connect(()=>{
Copy link
Member

@blink1073 blink1073 May 25, 2017

Choose a reason for hiding this comment

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

Needs whitespace around =>.

@@ -124,6 +140,16 @@ class FileEditor extends CodeEditorWrapper {
this.title.label = path.split('/').pop();
}

private _onCollaboratorsChanged(): void {
Copy link
Member

@blink1073 blink1073 May 25, 2017

Choose a reason for hiding this comment

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

Needs a docstring.

@blink1073
Copy link
Member

@blink1073 blink1073 commented May 25, 2017

Thanks!

@blink1073 blink1073 merged commit 24fbcda into jupyterlab:master May 25, 2017
2 checks passed
@ian-r-rose ian-r-rose deleted the collaborator_cursors branch May 25, 2017
@blink1073 blink1073 mentioned this pull request May 30, 2017
@lock lock bot locked as resolved and limited conversation to collaborators Aug 10, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants