Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
160 commits
Select commit Hold shift + click to select a range
c512de3
Update component.jsx
hiroshisuga Jan 26, 2023
70ff87e
Update component.jsx
hiroshisuga Jan 26, 2023
143e46c
Update container.jsx
hiroshisuga Jan 26, 2023
df7451b
Update component.jsx
hiroshisuga Jan 26, 2023
acbb30d
Update component.jsx
hiroshisuga Jan 26, 2023
e163a5d
Update styles.js
hiroshisuga Jan 26, 2023
c61466b
Update component.jsx
hiroshisuga Jan 26, 2023
e70da44
Update component.jsx
hiroshisuga Jan 26, 2023
0205975
Update component.jsx
hiroshisuga Jan 26, 2023
2b6b456
Update component.jsx
hiroshisuga Jan 26, 2023
69247f0
Update component.jsx
hiroshisuga Jan 26, 2023
4e7a64a
Update component.jsx
hiroshisuga Jan 26, 2023
0a26ac0
temporary remove props
hiroshisuga Jan 28, 2023
34ea2b2
Merge pull request #149 from bigbluebutton/v2.6.x-release
hiroshisuga Jan 28, 2023
2a7a291
revert the temporary update
hiroshisuga Jan 28, 2023
52f0d34
Update component.jsx
hiroshisuga Jan 28, 2023
fe0bc26
No cursor offset for detached presentation
hiroshisuga Jan 28, 2023
b763948
Update component.jsx
hiroshisuga Jan 28, 2023
417c782
Update component.jsx
hiroshisuga Jan 28, 2023
8f5c6dd
revert adding presentationWindow
hiroshisuga Jan 28, 2023
54d1036
Update component.jsx
hiroshisuga Jan 28, 2023
d753407
Update component.jsx
hiroshisuga Jan 28, 2023
c955519
update presentation size for detached win
hiroshisuga Jan 28, 2023
2ad4f9f
firstChild -> documentElement
hiroshisuga Jan 29, 2023
4249ed8
tldraw-fonts style does not exist anymore..
hiroshisuga Jan 29, 2023
2743e7b
import new fonts from tldraw
hiroshisuga Jan 29, 2023
7759415
remove TLD supplement style -> presen.comp
hiroshisuga Jan 29, 2023
f47bc74
Supplement TLD global style here
hiroshisuga Jan 29, 2023
2f7a205
remove logger
hiroshisuga Jan 29, 2023
c9cfdd2
change the presentationBound values
hiroshisuga Jan 30, 2023
1c7083c
size and position styled.presencont
hiroshisuga Jan 30, 2023
fe9d669
popup correctly shown
hiroshisuga Feb 4, 2023
ee1afa7
show presentationtool pop on the detached win
hiroshisuga Feb 5, 2023
a42c9e9
remove unnecessary codes
hiroshisuga Feb 6, 2023
c164465
new togglefullscreen
hiroshisuga Feb 9, 2023
dc4ea0e
new togglefullscreen
hiroshisuga Feb 9, 2023
b6e2a51
new togglefullscreen
hiroshisuga Feb 9, 2023
8528913
Better panel appearance
hiroshisuga Feb 10, 2023
bc7ad61
revert
hiroshisuga Feb 10, 2023
4bf1090
RTL (prob no effect)
hiroshisuga Feb 10, 2023
67d2e21
RTL style menu
hiroshisuga Feb 10, 2023
42b542a
comment for darkmode error
hiroshisuga Feb 10, 2023
ae765de
moving to presentationmenu
hiroshisuga Feb 11, 2023
59ab936
moving to presentationmenu
hiroshisuga Feb 11, 2023
9dc2e7e
moving to presentationmenu
hiroshisuga Feb 11, 2023
534c39b
moving to presentationmenu
hiroshisuga Feb 11, 2023
5ebde11
moving to presentationmenu
hiroshisuga Feb 11, 2023
b1c09a0
better mobile/tablet detection
hiroshisuga Feb 11, 2023
3e40a91
comment on keydown event listner
hiroshisuga Feb 11, 2023
c286695
moving to presentationmenu
hiroshisuga Feb 11, 2023
e04427b
fix a bug
hiroshisuga Feb 11, 2023
2a10a7d
shapes not shown when detached
hiroshisuga Feb 11, 2023
56c4ef9
add comment for div names
hiroshisuga Feb 11, 2023
d7f0e56
comment on DarkMode error
hiroshisuga Feb 11, 2023
d9f4b4a
add css to tldraw tooltips
hiroshisuga Feb 11, 2023
12b323f
sticky note size fix
hiroshisuga Feb 11, 2023
02276cd
fix tldraw tooltip selector
hiroshisuga Feb 11, 2023
733858d
fix stickynote, comment in CSS has to be /* */
hiroshisuga Feb 11, 2023
764a285
space before ! (chore)
hiroshisuga Feb 11, 2023
4d3ef3b
Fix text position and sticky CSS
hiroshisuga Feb 11, 2023
fa88b87
Change the tactics for touching tldraw elems
hiroshisuga Feb 12, 2023
53e1fb9
Fix sticky and text
hiroshisuga Feb 13, 2023
dfdc2d1
var -> let
hiroshisuga Feb 13, 2023
9850525
Merge branch 'dev2.6.0rc4_detachable' into v260test2
hiroshisuga Feb 20, 2023
b75d778
Merge pull request #152 from hiroshisuga/v260test2
hiroshisuga Feb 20, 2023
a82cb94
rm dup codes
hiroshisuga Feb 20, 2023
eaee28c
Remove touch TLD routines
hiroshisuga Feb 26, 2023
e2b9d43
touch TDL elements when first detach happens
hiroshisuga Feb 26, 2023
670e41e
remove dock position change
hiroshisuga Feb 28, 2023
2cd8876
touch the sided dock CSS
hiroshisuga Feb 28, 2023
f0fa89f
Update component.jsx
hiroshisuga Feb 28, 2023
7d0554f
selectnone
hiroshisuga Mar 1, 2023
8888191
destroy the magical area
hiroshisuga Mar 2, 2023
29c341e
add new globalstyles
hiroshisuga Mar 4, 2023
a3005c0
expand & in SCSS
hiroshisuga Mar 5, 2023
3ef70f1
#ECECEC -> var(--colors-hover)
hiroshisuga Mar 5, 2023
35dfbea
add hover effect to primary tools button
hiroshisuga Mar 5, 2023
d28adde
workaround mousedown to remove popups
hiroshisuga Mar 5, 2023
ffb6bff
no double context menus anymore
hiroshisuga Mar 7, 2023
49d47c2
button background:none for Safari
hiroshisuga Mar 13, 2023
f61bd1c
Supplement key shortcuts
hiroshisuga Mar 13, 2023
4974a54
remove a comment
hiroshisuga Mar 13, 2023
c5d4875
simplify the access to API
hiroshisuga Mar 14, 2023
7e1b3a7
Fullscreen by hitting Enter Key
hiroshisuga Mar 14, 2023
faf4492
Ctrl+A shortcut
hiroshisuga Mar 14, 2023
77f8653
shift+h -> H, shift+v -> V
hiroshisuga Mar 14, 2023
2687637
chore capital letters
hiroshisuga Mar 14, 2023
304a663
Add amIPresenter prop
hiroshisuga Mar 14, 2023
33dea6a
add amIPresenter condition for toggle detach
hiroshisuga Mar 14, 2023
2f2e3eb
Merge branch 'dev2.6.0rc8_detachable' into temp_to_push2.6
hiroshisuga Mar 16, 2023
bc05779
Merge pull request #155 from hiroshisuga/temp_to_push2.6
hiroshisuga Mar 16, 2023
c5c4299
Remove unused *Previous* parameters
hiroshisuga Mar 17, 2023
b053ea3
Remove unused toolbarWidth setting
hiroshisuga Mar 17, 2023
f173ad2
recover space
hiroshisuga Mar 17, 2023
9d5d7ed
Remove space again
hiroshisuga Mar 17, 2023
dba94d6
remove unused lines
hiroshisuga Mar 17, 2023
e016172
Remove unused line
hiroshisuga Mar 17, 2023
95c4788
Remove globalStyle (moved to style.js)
hiroshisuga Mar 17, 2023
c84c0dd
remove EditableEBWrapper
hiroshisuga Mar 17, 2023
99c825f
remove this from this.getToolbarHeight
hiroshisuga Mar 17, 2023
aee3553
Recover ?etPrevious* sizes
hiroshisuga Mar 17, 2023
c688f6c
add styles that was moved to styles.js
hiroshisuga Mar 17, 2023
e34bd04
move globalStyleText to styles.js
hiroshisuga Mar 17, 2023
0533092
Move in TldrawGlobalStyleText
hiroshisuga Mar 17, 2023
51f5988
add presentationWindow to pan injector
hiroshisuga Mar 17, 2023
822f95e
add presentationWindow
hiroshisuga Mar 17, 2023
2f3d851
Minimize the dummy shapes
hiroshisuga Mar 17, 2023
e587564
Fix hover on disabled button
hiroshisuga Mar 17, 2023
da4d23f
remove unused style import
hiroshisuga Mar 17, 2023
b3b59c6
avoid boolean literals
hiroshisuga Mar 17, 2023
f9618d0
implement redo undo shortcuts
hiroshisuga Mar 18, 2023
b6843f6
Disable canvas.addEventListener for detached win
hiroshisuga Mar 18, 2023
22c42b1
pan only with mouse wheel
hiroshisuga Mar 18, 2023
773a077
disable add wheel eventlistener for detached win 2
hiroshisuga Mar 18, 2023
92cc63f
remove setMenuOpen(false) as not working
hiroshisuga Mar 21, 2023
413f81a
add comment
hiroshisuga Mar 21, 2023
bf32af6
add darkTheme prop to PresentationMenu
hiroshisuga Mar 21, 2023
5e82072
disable detach presentation button when darkTheme
hiroshisuga Mar 21, 2023
e31d263
modify comment
hiroshisuga Mar 21, 2023
9b05741
modify comment
hiroshisuga Mar 21, 2023
e19c395
Merge pull request #157 from hiroshisuga/test2.6detach
hiroshisuga Mar 22, 2023
3e9668e
Add Ja locale just for personal use
hiroshisuga Mar 24, 2023
7cb5ad8
pan shortcut by spacebar
hiroshisuga Mar 25, 2023
fe4cf43
remove unnecessary styles for posterior injection
hiroshisuga Mar 25, 2023
11b6415
simplify style RTL for sticky
hiroshisuga Mar 25, 2023
25a68a6
add comment
hiroshisuga Mar 25, 2023
8b52b63
adapt to a new commit
hiroshisuga Mar 29, 2023
e196c91
revert the previous change
hiroshisuga Mar 29, 2023
0b69d68
Panning with Spacebar fix
hiroshisuga Mar 29, 2023
9e4bc38
Merge branch 'dev2.6.1_detachable' into test2.6.1_for_detach
hiroshisuga Apr 1, 2023
78a76ab
Merge pull request #166 from hiroshisuga/test2.6.1_for_detach
hiroshisuga Apr 1, 2023
815f96d
[fix] add args to supplemented styles
hiroshisuga Apr 2, 2023
99947a8
Update styles.js
hiroshisuga Apr 2, 2023
f3402ce
Update styles.js
hiroshisuga Apr 2, 2023
f2ae4f8
Update styles.js
hiroshisuga Apr 2, 2023
d9e23f1
Update styles.js
hiroshisuga Apr 2, 2023
abc7efe
recover tldraw cursor
hiroshisuga Apr 2, 2023
a867218
expand & as they are not styled.component
hiroshisuga Apr 2, 2023
98cae79
revert to expanded styles
hiroshisuga Apr 2, 2023
75c8abf
recover hover on primary tools
hiroshisuga Apr 2, 2023
e591734
add panSelected to tldgsarg
hiroshisuga Apr 3, 2023
eeb9ef8
hover effect fix
hiroshisuga Apr 3, 2023
7b8c8f7
remove unnecessary comments
hiroshisuga Apr 3, 2023
d03c615
add presentationWindow
hiroshisuga Apr 3, 2023
9baa588
expand :hover,:focus for pan tool
hiroshisuga Apr 4, 2023
f7e7ad7
Merge branch 'dev2.6.1_detachable' into test261
hiroshisuga Apr 12, 2023
017d172
Merge pull request #173 from hiroshisuga/test261
hiroshisuga Apr 12, 2023
8fef32d
Merge branch 'dev2.6.1_detachable' into test261_tomerge
hiroshisuga Apr 13, 2023
09278d2
Merge pull request #176 from hiroshisuga/test261_tomerge
hiroshisuga Apr 13, 2023
ea50436
Merge branch 'test2.6.3_showdiff_detach' into dev2.6.3_detachable
hiroshisuga Apr 21, 2023
482a40c
add comma
hiroshisuga May 6, 2023
1b2c584
toolbar animation
hiroshisuga May 7, 2023
c75a86d
toolbar animation
hiroshisuga May 7, 2023
b7d7afb
toolbar animation
hiroshisuga May 7, 2023
6b2a6c9
fix presentation resize failure
hiroshisuga May 9, 2023
2d714f8
fix - fitToWidth
hiroshisuga May 10, 2023
a62b8d9
unify newZoom calculation
hiroshisuga May 12, 2023
28dbb87
Update ja.json
hiroshisuga Jun 3, 2023
4c3413e
fix: fonts in toolbox
hiroshisuga Jun 10, 2023
190ee69
fix: fonts in toolbox
hiroshisuga Jun 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
function getFullscreenElement() {
if (document.fullscreenElement) return document.fullscreenElement;
if (document.webkitFullscreenElement) return document.webkitFullscreenElement;
if (document.mozFullScreenElement) return document.mozFullScreenElement;
if (document.msFullscreenElement) return document.msFullscreenElement;
function getFullscreenElement(d = document) {
if (d.fullscreenElement) return d.fullscreenElement;
if (d.webkitFullscreenElement) return d.webkitFullscreenElement;
if (d.mozFullScreenElement) return d.mozFullScreenElement;
if (d.msFullscreenElement) return d.msFullscreenElement;
return null;
}

const isFullScreen = (element) => {
if (getFullscreenElement() && getFullscreenElement() === element) {
const isFullScreen = (element, doc = document) => {
if (getFullscreenElement(doc) && getFullscreenElement(doc) === element) {
return true;
}
return false;
};

function cancelFullScreen() {
if (document.exitFullscreen) {
document.exitFullscreen();
} else if (document.mozCancelFullScreen) {
document.mozCancelFullScreen();
} else if (document.webkitExitFullscreen) {
document.webkitExitFullscreen();
function cancelFullScreen(doc = document) {
if (doc.exitFullscreen) {
doc.exitFullscreen();
} else if (doc.mozCancelFullScreen) {
doc.mozCancelFullScreen();
} else if (doc.webkitExitFullscreen) {
doc.webkitExitFullscreen();
}
}

function fullscreenRequest(element) {
function fullscreenRequest(element, doc = document) {
if (element.requestFullscreen) {
element.requestFullscreen();
} else if (element.mozRequestFullScreen) {
Expand All @@ -35,17 +35,18 @@ function fullscreenRequest(element) {
} else {
return;
}
document.activeElement.blur();
doc.activeElement.blur();
element.focus();
}

const toggleFullScreen = (ref = null) => {
const element = ref || document.documentElement;
const toggleFullScreen = (ref = null, isDetached = false, presentationWin = window) => {
const element = ref || (isDetached ? presentationWin.document.documentElement : document.documentElement) ;
const doc = isDetached ? presentationWin.document : document;

if (isFullScreen(element)) {
cancelFullScreen();
if (isFullScreen(element, doc)) {
cancelFullScreen(doc);
} else {
fullscreenRequest(element);
fullscreenRequest(element, doc);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,70 @@ import PropTypes from 'prop-types';
import PresentationContainer from '../presentation/container';

class PresentationPods extends PureComponent {
constructor() {
super();

this.state = {
isPresentationDetached: false,
};

this.previousSvgSize = {width:0, height:0};
this.previousToolbarHeight = 0;
this.setPresentationDetached = this.setPresentationDetached.bind(this);
this.togglePresentationDetached = this.togglePresentationDetached.bind(this);
this.setPreviousSvgSize = this.setPreviousSvgSize.bind(this);
this.getPreviousSvgSize = this.getPreviousSvgSize.bind(this);
this.setPreviousToolbarHeight = this.setPreviousToolbarHeight.bind(this);
this.getPreviousToolbarHeight = this.getPreviousToolbarHeight.bind(this);
}

setPresentationDetached(isDetached) {
this.setState({ isPresentationDetached: isDetached });
}

setPreviousSvgSize(w, h) {
this.previousSvgSize = {
width: w,
height: h,
}
}

getPreviousSvgSize() {
return this.previousSvgSize;
}

setPreviousToolbarHeight(h) {
this.previousToolBarHeight = h;
}

getPreviousToolbarHeight() {
return this.previousToolBarHeight;
}

togglePresentationDetached() {
const { isPresentationDetached } = this.state;
this.setState({ isPresentationDetached: !isPresentationDetached });
}

render() {
/*
filtering/sorting presentation pods goes here
all the future UI for the pods also goes here
PresentationContainer should fill any empty box provided by us
*/
return (
<PresentationContainer podId="DEFAULT_PRESENTATION_POD" {...this.props} />
<PresentationContainer
podId="DEFAULT_PRESENTATION_POD"
key={this.state.isPresentationDetached && this.state.isPresentationDetached.id}
isPresentationDetached={this.state.isPresentationDetached}
setPresentationDetached={this.setPresentationDetached}
togglePresentationDetached={this.togglePresentationDetached}
setPreviousSvgSize={this.setPreviousSvgSize}
getPreviousSvgSize={this.getPreviousSvgSize}
setPreviousToolbarHeight={this.setPreviousToolbarHeight}
getPreviousToolbarHeight={this.getPreviousToolbarHeight}
{...this.props}
/>
);
}
}
Expand Down
Loading