Commit Graph

432 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
f533b25d69 Improved whiteboard-toolbar and fixed linter warnings 2017-08-24 16:47:20 -07:00
Oleksandr Zhurbenko
f3481a7e4b Turned on multi-user drawings 2017-08-23 21:27:41 -07:00
Oleksandr Zhurbenko
321b47abd1 Fixed pencil and text draw listeners for presenters 2017-08-23 20:35:34 -07:00
Oleksandr Zhurbenko
af558ff61d Fixed cursor's rendering including smoothing; adjusted cursor's label 2017-08-22 13:20:12 -07:00
Oleksandr Zhurbenko
aa68421462 Fixed most of lint errors under components/whiteboard
Except annotation group, which will be changed soon
2017-08-19 23:32:01 -07:00
Oleksandr Zhurbenko
d5f07a574c Fixed publishShape message for 4 common shapes
Line, Rectangle, Triangle, Ellipse
2017-08-18 19:47:31 -07:00
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Oleksandr Zhurbenko
fa1458c3eb Handling and publishing multi-user mode switch 2017-08-02 18:24:38 -07:00
Klaus
4495c2e897 Move from annotation/ to annotations/ 2017-08-02 16:52:13 -03:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
Klaus
916713b1df Add safe true, preventing mess with the arrays, and refactored the shapes 2017-07-24 17:32:35 -03:00
Oleksandr Zhurbenko
a03ff03a84 Fixed shape's thickness 2017-07-17 16:41:07 -07:00
Oleksandr Zhurbenko
23263c997b Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-07-17 16:01:05 -07:00
Oleksandr Zhurbenko
1508ed566c Resolved some of the issues related to the 2.0 switch 2017-07-14 16:20:16 -07:00
Oleksandr Zhurbenko
d7a4cd7a67 Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x 2017-07-14 16:15:26 -07:00
Oleksandr Zhurbenko
d7ec74dcde Added initial PanZoomDrawListener 2017-07-14 16:14:38 -07:00
Oleksandr Zhurbenko
82a1ad2c8a Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x 2017-07-14 15:43:41 -07:00
Klaus
743e128b0f Fix Poll display on html5 2017-07-07 09:18:54 -03:00
Klaus
4138f54f17 Fix Poll display on html5 2017-07-07 09:18:37 -03:00
Klaus
8b6cb71854 Shapes add correct in the collection 2017-06-22 14:24:00 -03:00
Klaus
b3865ef90d Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis 2017-06-20 14:11:19 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Oleksandr Zhurbenko
f7d1ff0df2 Text shape and bug fixes
Restructured code, fixed a bug with thickness icon not displayed when switching from Text tool, added textshape container
2017-06-16 19:32:41 -07:00
Oleksandr Zhurbenko
a9a8a48413 Fixed a bug with focus not working onBlur in FF 2017-06-16 13:33:10 -07:00
Oleksandr Zhurbenko
461a702759 Passing the data from the presenter's text shape to the whiteboard overlay 2017-06-10 19:21:37 -07:00
Oleksandr Zhurbenko
16d03ca32b Fixed a bug with the text shape's static clipPath id
ClipPath worked fine only for the first text shape
2017-06-09 14:55:38 -07:00
Oleksandr Zhurbenko
1a8aaefb0e Fixed svg animation for svg whiteboard-toolbar icons 2017-06-07 14:40:15 -07:00
Oleksandr Zhurbenko
9e08cb8567 Refs, PropTypes, fixes 2017-06-07 14:25:47 -07:00
Oleksandr Zhurbenko
1309bb1808 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-07 14:12:04 -07:00
Oleksandr Zhurbenko
6a228c0b77 Corrected the calls to the server-side 2017-06-07 13:45:49 -07:00
Oleksandr Zhurbenko
017ff470c3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-07 13:29:35 -07:00
Oleksandr Zhurbenko
2bcc03527c Added a check isPresenter to shapeFactory in order to render either presenter's or viewer's version of the text shape 2017-06-06 17:14:36 -07:00
Oleksandr Zhurbenko
465c0c1517 Changed whiteboard-toolbar's refs to callbacks, fixed a bug with the initial radius of the thickness svg icon 2017-06-06 16:47:31 -07:00
Oleksandr Zhurbenko
1ba4018629 Cleanup 2017-06-05 20:15:37 -07:00
Oleksandr Zhurbenko
52fae1b8c8 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into refs-to-callbacks 2017-06-05 19:51:20 -07:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Oleksandr Zhurbenko
df077afe51 Corrected findDOMNode import for the poll shape 2017-06-04 16:25:21 -07:00
Oleksandr Zhurbenko
06493fda7f Switched to prop-types package to remove new React 15 warnings 2017-06-03 19:40:14 -07:00
Oleksandr Zhurbenko
3ef376e095 Switched from String refs to callback refs 2 2017-06-03 17:02:00 -07:00
Oleksandr Zhurbenko
a0224dcffc Replaced String refs with callback refs
String refs will be deprecated in the next React releases, since they have some performance issues
2017-06-03 16:58:27 -07:00
Oleksandr Zhurbenko
87a2ef93dc Added transitions for the color and thickness icons on the toolbar 2017-06-02 17:41:39 -07:00
Oleksandr Zhurbenko
c8af9c70b1 Added a font-size setting for the text shape to the whiteboard-toolbar 2017-06-02 16:46:02 -07:00
Oleksandr Zhurbenko
9550c4235d Fixed race condition for the drawSettings 2017-06-02 16:40:52 -07:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
Oleksandr Zhurbenko
cd5cb62949 Generating the shape id above all the draw listeners 2017-05-26 15:06:49 -07:00
Oleksandr Zhurbenko
b5171ae4eb Fixed a problem with selecting elements while drawing, splitted getTransformedSvgCoordinate so that it could be reused by the text shape 2017-05-26 14:20:55 -07:00
Oleksandr Zhurbenko
967c0bb4fb Restructuring, improvements
Removed unnecessary state, 'out of bounds' check, adjusted the coordinate system for the text shape
2017-05-26 13:06:34 -07:00
Oleksandr Zhurbenko
ff197c3773 Pencil annotation 2017-05-19 16:43:33 -07:00
Oleksandr Zhurbenko
371419c41c Text shape preserves white space now and handles new lines 2017-05-12 12:46:10 -07:00
Oleksandr Zhurbenko
84aab7706a Text shape preserves white space now and handles new lines 2017-05-12 12:43:06 -07:00
Oleksandr Zhurbenko
8de7b895b5 Optimized and validated undo/clear/send annotation methods 2017-05-10 11:59:17 -07:00
Oleksandr Zhurbenko
f04dae31c8 Added a version for the shape model and implemented shouldComponentUpdate
Which prevents the shapes from being re-calculated if nothing has changed
2017-05-09 13:34:46 -07:00
Oleksandr Zhurbenko
0268c59487 Optimized shape rendering
WhiteboardShapeModel was created for each shape, but now we create one ShapeGroup which keeps a hashtable of Shape component references and calls them efficiently
2017-05-08 13:37:09 -07:00
Oleksandr Zhurbenko
0028b5128d Plugged in thickness and color to the whiteboard-overlay from the whiteboard-toolbar 2017-05-04 07:33:16 -07:00
Oleksandr Zhurbenko
2c01a6ae5a Passed the data from the whiteboard-toolbar to the whiteboard-overlay 2017-05-02 17:05:41 -07:00
Oleksandr Zhurbenko
f415390673 Added rounded borders for the rectangle shape to be consistent with the Flash client 2017-05-02 15:49:15 -07:00
Oleksandr Zhurbenko
49124c12b1 Replaced the cursor icons in html5 with the new ones
Included original svg files for the future reference and creating different cursor icons of different sizes
2017-05-02 13:24:48 -07:00
Oleksandr Zhurbenko
303e6b2edb Displayed and positioned icons for the whiteboard tools 2017-05-02 09:04:05 -07:00
Oleksandr Zhurbenko
286f077ed3 Added initial drawing functionality for Line/Rectangle/Triangle/Ellipse 2017-05-01 14:34:24 -07:00
Oleksandr Zhurbenko
f709721ae5 Removed rectangle's rounded corners to be consistent with the Flash client 2017-04-27 16:22:28 -07:00
Oleksandr Zhurbenko
ace300c316 Fixed a property name 2017-04-24 15:19:57 -07:00
Oleksandr Zhurbenko
edabe3c623 Clear All Annotations functionality 2017-04-21 11:01:52 -07:00
Oleksandr Zhurbenko
1e4f16048f Added an Undo Annotation functionality 2017-04-19 11:27:00 -07:00
Oleksandr Zhurbenko
206229e3b8 Added UI for the WhiteboardToolbar 2017-04-18 17:54:51 -07:00
Oleksandr Zhurbenko
416bda1826 Added a smooth transition for the pencil's path 2017-03-21 15:00:01 -07:00
Oleksandr Zhurbenko
652dac0cc0 Initial whiteboard overlay component
Returns correct coordinates
2017-02-28 10:35:56 -08:00
Oleksandr Zhurbenko
b4f904d3ea Adjusted cursor functionality to the new structure 2017-02-23 16:11:27 -08:00
Oleksandr Zhurbenko
d5da606bc6 Fixed a bug with variable names 2017-02-23 15:28:04 -08:00
Oleksandr Zhurbenko
56989c54ac Added Cursor functionality 2017-02-23 15:27:48 -08:00
Oleksandr Zhurbenko
03791aa7f1 Added publishCursorUpdate method to the cursor api 2017-02-23 15:26:59 -08:00
Oleksandr Zhurbenko
119beae88b Restructured whiteboard code 2017-02-23 10:20:45 -08:00
Oleksandr Zhurbenko
8f74e984ac Restructured the whiteboard code 2017-02-23 10:19:59 -08:00
Oleksandr Zhurbenko
10c8b86a0d Renamed whiteboard to presentation 2017-02-23 10:14:35 -08:00
JaeeunCho
20399830be HTML5 - changed arrow color of presentation 2017-01-20 10:49:16 -08:00
Lajellu
95903abe7c HTML5 - comment out unimplemented presenter slide control UI 2016-12-20 10:33:14 -08:00
gcampes
0aa6022c89 Changes breakout code to handle the new message format 2016-11-23 13:32:04 -02:00
gcampes
e14c9159df Fix breakout closing issues 2016-11-22 13:46:08 -02:00
Anton Georgiev
f0a18f6210 improve dropdown slide switch to pass a number, not string so server checks pass 2016-11-15 16:30:13 +00:00
Oswaldo Acauan
1df46bb201 Refactor of Presentations API 2016-11-11 19:02:46 +00:00
Oleksandr Zhurbenko
576a8b287f Added a check for cursor data
Since it is undefined sometimes
2016-08-20 19:59:32 -07:00
Oleksandr Zhurbenko
d9ddbfbda6 Cleanup, linting, fixed css modules' imports 2016-08-20 18:14:12 -07:00
Oleksandr Zhurbenko
f64ed1fd4a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning 2016-08-20 16:37:11 -07:00
Lajellu
33061b3a01 HTML5 slide controls: chgs zoomForm to zoomWrapper and adds a min width to zoomWrapper 2016-08-05 13:40:34 -07:00
Lajellu
76679c9cb9 removes HTML5 whiteboard extra code, whiteboard css trailing space, and rename service in slide controls 2016-08-05 13:13:48 -07:00
Lajellu
41019e81a9 HTML5 slide controls 'order' attribute moved to a higher line 2016-08-05 12:13:37 -07:00
Lajellu
12ec76d375 Fixes slide control PR comments 2016-08-05 11:39:24 -07:00
Lajellu
219078f49d adds slide controls and new bbb icons 2016-08-02 15:55:20 -07:00
Oleksandr Zhurbenko
d510907179 Upgraded Meteor to 1.4 2016-07-27 14:50:35 -07:00
Lajellu
1ead9ced59 adds presentation controls 2016-07-26 13:56:43 -07:00
Lajellu
f1d79376ee Fixes Cursor propTypes 2016-07-18 08:30:04 -07:00
Lajellu
1acdc0a13b Adds cursor xy tracking 2016-07-15 13:50:03 -07:00
Oleksandr Zhurbenko
87c4ee98ea Added a white background for the slide
Since it is transparent for some SVG files
2016-07-09 14:42:33 -07:00
Oleksandr Zhurbenko
3522e1039e Moved polling files back to components folder 2016-07-07 10:08:26 -07:00
Oleksandr Zhurbenko
6266da7ccd Fixed a small issue with reduce() in the poll annotation 2016-07-06 12:38:13 -07:00
Oleksandr Zhurbenko
92db94099d Made polling buttons accessible 2016-07-05 14:49:31 -07:00
Oleksandr Zhurbenko
4bd63fd79f Updated packages and fixed some of the warnings introduced by React 15.2.0 2016-07-04 17:06:18 -07:00
Oleksandr Zhurbenko
93e4f3e66c Centering polling buttons 2016-06-30 15:26:42 -07:00
Oleksandr Zhurbenko
f26ab0ac52 Title and calculated styling for the polling UI 2016-06-30 15:21:46 -07:00
Oleksandr Zhurbenko
83fff53269 Replaced polling under the whiteboard 2016-06-29 15:00:06 -07:00
Oleksandr Zhurbenko
2b4aced77d Fixed naming according to the BBB's style guide 2016-06-27 07:48:17 -07:00
Oleksandr Zhurbenko
29e8524de0 Polishing 2016-06-24 14:30:37 -07:00
Oleksandr Zhurbenko
6920d8b2a6 Added a check for unknown shape types 2016-06-22 15:58:28 -07:00
Oleksandr Zhurbenko
22ab079f5c Optimized polling strings and centered the strings 2016-06-22 15:20:08 -07:00
Oleksandr Zhurbenko
04e2e940c0 Fixed a but with inherited margin in Firefox 2016-06-22 15:17:31 -07:00
Oleksandr Zhurbenko
bca7b8c005 Added Polling shape functionality 2016-06-21 16:19:39 -07:00
Oleksandr Zhurbenko
a0bfbe8433 Added Text shape functionality 2016-06-14 13:01:11 -07:00
Oleksandr Zhurbenko
7f845ed8d9 Added clippath, so that users can't see anything outside of the viewBox 2016-06-09 12:00:44 -07:00
Oleksandr Zhurbenko
12eff5d568 Added Rectangle shape functionality 2016-06-09 11:58:41 -07:00
Oleksandr Zhurbenko
2a46f618f5 Added Triangle shape functionality 2016-06-08 10:13:25 -07:00
Oleksandr Zhurbenko
17dcbd7bfe Added Pencil shape functionality 2016-06-08 10:12:24 -07:00
Oleksandr Zhurbenko
2f359d80ae Rounded the Line shape endings 2016-06-07 11:33:31 -07:00
Oleksandr Zhurbenko
cdf00b6faf Fixed linter warnings and a bug with the thickness while zooming in 2016-06-07 11:30:44 -07:00
Oleksandr Zhurbenko
fbe6a4ca36 Added zoom and pan 2016-06-07 11:08:25 -07:00
Oleksandr Zhurbenko
23b00440bc Line shape functionality 2016-06-06 10:12:14 -07:00
Oleksandr Zhurbenko
cd500ea654 Added functionality for the Circle shape 2016-06-04 16:09:50 -07:00
Oleksandr Zhurbenko
af077961e3 Added helpers for the shape components 2016-06-03 15:39:28 -07:00
Oleksandr Zhurbenko
25b55ba9d7 Switched to CSS scaling for SVG 2016-06-02 15:09:28 -07:00
Oleksandr Zhurbenko
6db05cf0f4 Added scaling on window resize for the slide 2016-06-01 16:37:51 -07:00
Oleksandr Zhurbenko
7730d50948 Centered the slide 2016-06-01 14:57:19 -07:00
Oleksandr Zhurbenko
6046c6c5a9 Removed unnecessary wrappers and adjusted styling 2016-05-30 16:10:01 -07:00
Oleksandr Zhurbenko
949511f9b5 Linting, changed line endings from Windows to Unix 2016-05-30 15:07:02 -07:00
Oleksandr Zhurbenko
ba7cdca648 Added fade in for the slides and a default content 2016-05-30 11:12:02 -07:00
Oleksandr Zhurbenko
179ce3c2bd Swapping whiteboard with default view if there is no current slide 2016-05-27 18:10:34 -07:00
Oleksandr Zhurbenko
84318b10f0 Adjusted imports, cleaned up 2016-05-26 17:13:53 -07:00
Oleksandr Zhurbenko
16c46d50af Adjusted the whiteboard files to the new structure 2016-05-26 17:03:30 -07:00
Oswaldo Acauan
37b86d9176 Improve some basic styles 2016-05-20 13:35:15 -03:00
Oswaldo Acauan
0e6c6f1f99 Improve some styles on the media 2016-05-20 12:02:57 -03:00
Oswaldo Acauan
a69d7faab9 Add iconRight option to Button component 2016-05-20 11:49:28 -03:00
Oswaldo Acauan
dc7cdb337f Add examples to Button component 2016-05-20 11:13:06 -03:00
Oswaldo Acauan
d3d997d211 Rename navbar, media, whiteboard and videodock to the new structure 2016-05-20 10:44:27 -03:00
Oswaldo Acauan
7aac407e35 Remove unnecessary component background colors 2016-05-20 10:41:15 -03:00
Oswaldo Acauan
ddd38c57ac Add i18n, modular layouts and basic styles 2016-05-03 17:40:46 -03:00