Commit Graph

63 Commits

Author SHA1 Message Date
Anton Georgiev
32f1473ba0 Merge branch 'meteor-client-whiteboard' of github.com:gthacoder/bigbluebutton into testing-version-002
Conflicts:
	labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
2014-09-22 21:51:09 +00:00
Maxim Khlobystov
3b7f9f254a Fixed the issue with multiple cursors (window resizing or undoing annotation). 2014-09-22 14:00:50 -07:00
Anton Georgiev
d5f4a1630e Merge branch 'meteor-client-whiteboard' of github.com:gthacoder/bigbluebutton into merge-whiteboard-changes 2014-09-22 20:14:14 +00:00
Maxim Khlobystov
a51d4874a4 Fixed the issue with redisplaying shapes that occured while changing slides or undoing annotation. 2014-09-21 16:36:50 -07:00
Maxim Khlobystov
50301a9ce9 Reverted the changes related to multiple cursors. 2014-09-21 16:24:06 -07:00
Maxim Khlobystov
938f883b63 Fixed multiple cursors issue on clicking 'Clear All Annotations' (cursor is being removed now). 2014-09-18 08:39:38 -07:00
Anton Georgiev
b17b2b1b99 Merge branch 'meteor-client-whiteboard' of https://github.com/gthacoder/bigbluebutton into testing-version-001 2014-09-17 22:04:43 +00:00
Lucas Zawacki
51dabcfdf5 Refactor whiteboard paper to use less variables 2014-09-17 17:24:13 -03:00
Lucas Zawacki
079c44a367 Add whiteboard pencil based on line tool 2014-09-17 17:04:30 -03:00
Maxim Khlobystov
fe526f5277 Encapsulated some duplicate code. 2014-09-15 09:46:02 -07:00
Maxim Khlobystov
e852cceeac Zooming is now applied to paths and all the geometric shapes too. 2014-09-12 13:26:25 -07:00
Maxim Khlobystov
84bddefcbc Fixed browser compatibility issue with running preservation of aspect ratio. 2014-09-12 10:43:19 -07:00
Maxim Khlobystov
022760f255 Added fixed borders adjustable for slide dimensions (fixed the issue with non-standard slides (i.e. A4)). 2014-09-11 16:10:51 -07:00
Maxim Khlobystov
c1443c45e0 Removed repeating code statement. 2014-09-10 18:12:36 -07:00
Maxim Khlobystov
4e5871dd8e Cleaned up. 2014-09-10 17:48:34 -07:00
Maxim Khlobystov
c37c5c6601 Implemented slide zooming and panning (horizontally and vertically). 2014-09-10 17:02:13 -07:00
Maxim Khlobystov
22ac4c6598 Proper handling of slide dimensions (natural size). 2014-09-09 09:30:02 -07:00
Maxim Khlobystov
5ef2913da4 Fixed ellipses on a whiteboard. 2014-09-07 13:34:59 -07:00
Maxim Khlobystov
3278da5505 Rounded linecap was added to whiteboard lines. 2014-09-04 11:31:47 -07:00
Anton Georgiev
70a3553ae9 cleaning up 2014-09-02 15:19:50 +00:00
Anton Georgiev
6776c17ca7 update whiteboard_text 2014-08-22 15:26:37 +00:00
Anton Georgiev
bebe541cbf colorful shapes (cont'd) 2014-08-21 22:31:32 +00:00
Anton Georgiev
8839613e0a Merge branch 'meteor-client-messages-better-templates' of github.com:gthacoder/bigbluebutton into colorful-shapes 2014-08-21 22:17:18 +00:00
Maxim Khlobystov
3538ce9509 Stroke color and width are displayed properly on HTML5 client's side. 2014-08-21 12:36:50 -07:00
Anton Georgiev
f1055361c9 Merge branch 'creating-better-templates' of https://github.com/perroned/bigbluebutton into merging-html5-with-master 2014-08-21 18:26:00 +00:00
Anton Georgiev
e93819e3af cleaning up 2014-08-21 18:24:01 +00:00
perroned
64ff5f1da2 Unified color conversion methods combining both to make it better, placed it in globals.coffee as a coffeescript function, and added a global handlebars helper that calls it too. 2014-08-21 07:40:19 -07:00
Anton Georgiev
a63ea5875e increased the size of the cursor to make it more visible 2014-08-19 21:20:11 +00:00
Anton Georgiev
de15efbc74 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 2014-08-19 20:28:12 +00:00
Anton Georgiev
0cb9dc4668 cleaning up 2014-08-19 20:27:44 +00:00
perroned
47bbfad399 Working on whiteboard sizing 2014-08-19 13:22:29 -07:00
Anton Georgiev
6fcaf6537b cleaning up 2014-08-19 19:53:27 +00:00
Anton Georgiev
3edc80bc63 improve the calculation for the relative location of the shape 2014-08-19 19:39:17 +00:00
Anton Georgiev
35086951e5 cleaning up 2014-08-19 19:36:45 +00:00
Anton Georgiev
6acc236cc8 cleaning up 2014-08-19 19:09:04 +00:00
Anton Georgiev
a976cd7c2e use the helper code within whiteboard_text 2014-08-19 18:46:50 +00:00
Anton Georgiev
a27bd5cd91 attempting to avoid the passing of a dom node as an argument 2014-08-19 18:45:45 +00:00
Anton Georgiev
4935e147d2 adding textFlow 2014-08-19 16:54:19 +00:00
Anton Georgiev
40afd09431 adding textShapes 2014-08-19 16:54:01 +00:00
Anton Georgiev
8999dfb77b Merge branch 'more-whiteboard-shapes' of https://github.com/lfzawacki/bigbluebutton into creating-better-templates 2014-08-15 15:52:47 +00:00
Anton Georgiev
029b26ab32 cleaning up and minor fix to slideshow error - whiteboard_paper's last function which is still under development 2014-08-15 15:22:39 +00:00
Anton Georgiev
6633a30d7d fix drawListOfShapes(shapes) and some cleaning up 2014-08-15 15:11:31 +00:00
Lucas Zawacki
7168439869 Drawing ellipses 2014-08-14 15:53:47 -03:00
Lucas Zawacki
b5067d8a37 Drawing lines on whiteboard 2014-08-14 15:11:56 -03:00
Lucas Zawacki
b06c00a458 Drawing triangles on whiteboard 2014-08-14 15:11:18 -03:00
Anton Georgiev
2ef0dbb232 working on handling slow drawing of shapes 2014-08-12 21:50:10 +00:00
Anton Georgiev
9d5000e636 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates
Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/main.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.html
	labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
2014-08-12 18:53:50 +00:00
Anton Georgiev
49b44d3533 in the process of separating "shape" 2014-08-11 15:56:46 +00:00
perroned
72cd8c1050 Made prettier, cleaned up code, removed things in code and UI that arent needed 2014-08-07 13:29:13 -07:00
perroned
903eda589f Major changes to UI and templates 2014-08-06 10:46:54 -07:00