Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

Collab highlight #140

Closed
wants to merge 38 commits into from
Closed

Collab highlight #140

wants to merge 38 commits into from

Conversation

@arshiannafi
Copy link

@arshiannafi arshiannafi commented Aug 10, 2017

No description provided.

MartinWangIBM and others added 30 commits June 23, 2017 12:03
@MartinWangIBM @SidneyJiang
Collaboration feature
4785b6e 
Patch for collaboration feature.

See https://github.com/Martin1994/orion.collab for commit histories.

Change-Id: I2cdc66cbcc01eb1932d31846711efaeaa7cf74dd
Signed-off-by: Martin Wang <[email protected]>
Also-by: Amr Mourad <[email protected]>
@MartinWangIBM @SidneyJiang
Fix xfer test
39c1269
@SidneyJiang
collab configuration
823c4fe 
Change-Id: Iff1e6864a41d212be9be3758d9cb761749b818bd
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
forgot this
c207f1a 
Change-Id: I83531797197b8a039bea03215bdb3e03964738bb
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
fix out of multi workspace implementation, part 1
19d17cd 
Change-Id: I016f921e36743eab80b5706eac4e01317838fb44
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
more fix
8271eb3 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
now sharedworkspaces are multi workspace based
f42c450 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
load first sharedworkspace if loc is sharedworkspace/tree
626bfdd 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
more fix
f262ed6
@SidneyJiang
more
9d31a2d 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
fixes
33f4e1e 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
ugly fixes, now at this point, everything works as demoed, next step …
94e7902 
…is to refactor the code

Signed-off-by: Sidney <[email protected]>
@SidneyJiang
cleaned 50% garbage code
c81fb19 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
cleaned more stuff, added file copied socket handler
6b09d59 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
forgot this file
36b62e5 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
call the fixes end for now
8c802a3 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
move doc from client code to server
766732c 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
ready to merge
4128b78 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
hide collab
2769a8b 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
tweak
f52b08a 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
fixed simpleMocha failure
48c0b43 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
fixed undefied removeEventListener
608fed4 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
remove unneeded lines
e808006 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
more cleanup before merge
599917e 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
use this version of request
31964f4 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
initial attempt
fe1c59e 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
keep going
f827c2b 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
now all seems working
f5e7256 
Signed-off-by: Sidney <[email protected]>
@SidneyJiang
clean the configurations
2c77da9 
Signed-off-by: Sidney <[email protected]>
@rsenekal @arshiannafi
Clean collaboration
a3451d2 
- Setup Sidney's commit for collaboration
- Base collaboration works without highlight
arshiannafi and others added 8 commits June 27, 2017 10:15
@arshiannafi @rsenekal
Add Collab Highlight Feature
4662117 
Added collab highlight implementation to Sidney's clean collaboration pr/46
@rsenekal @arshiannafi
Refactoring PeerHighlight
ceb2f80 
- Move div creation in a class function
@arshiannafi @rsenekal
Refactoring PeerHighlight
1dc0b09 
- Eliminate redundant:
  - Creation of highlight divs
  - Reassignment of constants variables
@arshiannafi
Update 'onDestroy' method
b4589ee 
Reflects the current data structure
@arshiannafi
Fix: remove highlight when peer leaves
5e6c9d1 
Removes highlight when peers leave.
E.g. exit browser without deselecting the text.
@arshiannafi @rsenekal
Restore altered code
279ac83 
Collab Highlight was originally built on an older commit. When collab highlight
code was copied to commit cb48ab, some code were altered as a side-effect.

In this commit, commit cb48ab (base) and 5e6c9d1 (head) was diff-ed
to find and restore altered code.

Restoring code from

1.
commit cb48ab8
Author: libing wang <[email protected]>
Date:   Thu Jun 22 15:04:33 2017 -0400
Subj:   Bug 514792 - AnnotationStyler to merge html and DOM node style in com...

Side-effect:    Around line `create: function(_parent, div, drawing) {`,
                all instance of 'drawing' was removed
In this commit: restored 'drawing'

2.
commit c81fb19
Author: Sidney <[email protected]>
Date:   Thu Jun 15 16:53:04 2017 -0400
Subj:   cleaned 50% garbage code

Side-effect:    '/file/' came back.
In this commit: removed '/file/'
@rsenekal @arshiannafi
Fix: Collab Highlight width inconsistency
435ee92 
Collab highlight width was inconsistent across different browsers.
The width would vary on different browsers as peers select long texts
on the same line. This is due to the use of a calculated constant in the code
rather than using environment variables that we were unaware of at the time.
Thanks to Silenio, we found a variable to fixes this issue.
@arshiannafi @rsenekal
Merge branch 'master' into collab_highlight4
6cd735f
@arshiannafi
Copy link
Author

arshiannafi commented Aug 10, 2017

@soulbeing, a cleaner cherry-picked pull-request (#141) is created as requested. Please close this pull-request

@soulbeing soulbeing closed this Aug 11, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

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.

5 participants

@arshiannafi @soulbeing @MartinWangIBM @SidneyJiang @rsenekal