Commit Graph

82 Commits

Author SHA1 Message Date
Gary
18159f1db4 manage UserModel in UserCollection 2013-06-26 08:15:01 -07:00
Leonardo Crauss Daronco
21c79844c5 HTML5: remove events emitted on Connection, now emitted on the event bus
And removed duplicated events for 'connected' and 'disconnected'.
2013-05-20 17:41:29 -03:00
Leonardo Crauss Daronco
1f0c53a151 HTML5: last view, chat, migrated to use the event bus 2013-05-20 15:47:18 -03:00
Leonardo Crauss Daronco
b80a0dc89e HTML5: create event bus, not finished yet
A global event bus to improve the structure of events in the
HTML5 client.
2013-04-29 17:26:09 -04:00
Leonardo Crauss Daronco
bc513c72f6 HTML5: cleanup/refactor whiteboard paper a bit more
PRESENTATION_SERVER was moved to a better place. It was kind of
hardcoded in the client, now it is passed to the client by the
server, so it can be easily configured in the server if needed in
the future.
2013-04-28 19:41:10 -04:00
Leonardo Crauss Daronco
bec08b559f HTML5: add WhiteboardSlideModel
It stores the slides that are shown in the whiteboard.
2013-04-28 18:01:23 -04:00
Leonardo Crauss Daronco
961d15828b HTML5: standard method to create tools in the whiteboard
Shrink the code a bit more.
2013-04-28 17:47:18 -04:00
Leonardo Crauss Daronco
7a9cbaecfb HTML5: add WhiteboardCursorModel, simplify whiteboard paper 2013-04-28 17:34:38 -04:00
Leonardo Crauss Daronco
d5a51ce6ec HTML5: more small fixes in the whiteboard drawings 2013-04-28 16:58:37 -04:00
Leonardo Crauss Daronco
c62533139f HTML5: add text tool to whiteboard 2013-04-28 16:24:43 -04:00
Leonardo Crauss Daronco
a3f286947e HTML5: small fixes in the whiteboard drawings 2013-04-28 13:21:08 -04:00
Leonardo Crauss Daronco
4792698ca4 HTML5: rects and ellipses work when drawn backwards
Rects and ellipses would not work if drawn from right to left and/or from
bottom to top, but now they work.
2013-04-27 22:19:25 -04:00
Leonardo Crauss Daronco
0b031558e9 HTML5: WhiteboardLineModel working for line and pencil tools 2013-04-27 20:28:08 -04:00
Leonardo Crauss Daronco
0c577090e5 HTML5: add ellipse and triangle to whiteboard 2013-04-27 20:00:52 -04:00
Leonardo Crauss Daronco
98a8d05bc1 Add WhiteboardToolModel as a base for whiteboard tools in HTML5
WhiteboardLineModel and WhiteboardRectModel already inherit from it.
2013-04-27 16:54:22 -04:00
Leonardo Crauss Daronco
76f06c9e80 Add WhiteboardLineModel to clean up WhiteboardPaperModel
First version, there are still things that should be moved from
WhiteboardPaperModel to it.
2013-04-27 16:06:38 -04:00
Leonardo Crauss Daronco
482debd9fe Round borders for rects and pencil in the HTML5 whiteboard
Makes the drawings more similar to the drawings in the flash client.
2013-04-27 14:58:20 -04:00
Leonardo Crauss Daronco
f44a1bb4ad Add WhiteboardRectModel to clean up WhiteboardPaperModel
First version, there are still things that should be moved from
WhiteboardPaperModel to it.
2013-04-27 14:37:42 -04:00
Leonardo Crauss Daronco
d2f09e916d Redraw shapes when resizing the HTML5 client
Only redrawing shapes that were loaded when the HTML5 started. Shapes
drawn before are not being saved in the arrays yet and so are not being
redraw when resizing (they disappear).
2013-04-27 11:58:20 -04:00
Leonardo Crauss Daronco
9589e7c7a1 Fix positioning of shapes in the whiteboard, not 100% yet 2013-04-25 19:54:26 -04:00
Leonardo Crauss Daronco
714cccc1f0 Fix the color of shapes drawn in the whiteboard 2013-04-25 17:12:55 -04:00
Leonardo Crauss Daronco
6c102519af Removing some class variables in WhiteboardPaperModel
They are variables that store the position and size of slides and now are
store with the slide they are associated with.
2013-04-25 16:57:20 -04:00
Leonardo Crauss Daronco
62739fa9fe Resize the slides to occupy 100% of the space 2013-04-25 10:05:38 -04:00
Dale Karp
0813595c61 fixed merges 2013-04-10 17:23:40 +00:00
Dale Karp
d721f762a8 fix merge conflicts 2013-04-10 16:44:42 +00:00
Markos Calderon
dfbf081409 added support for rect shape 2013-03-25 16:35:45 -05:00
Markos Calderon
c5a63cb1fb fix whiteboard shape doesn't appear when you change slide 2013-03-24 15:30:50 -05:00
Markos Calderon
2b95385c39 fixed whiteboard gap bug 2013-03-22 18:06:36 -05:00
Dale Karp
d239744c77 slides center in viewport when fitToPage is true 2013-03-20 16:46:29 +00:00
Dale Karp
f02751be0d #slide resizes on page load, fills up presentation area 2013-03-18 17:48:05 +00:00
Dale Karp
9bfbb0f754 pausing work on whiteboard issue for now 2013-03-07 20:32:14 +00:00
Dale Karp
fef3c2e198 progress check in for resizing html5 whitebord 2013-03-01 21:36:46 +00:00
Dale Karp
80cf67ccff integrating ScaleRaphael into current project 2013-02-28 15:26:36 +00:00
Dale Karp
9129158ea1 adding scale.raphael.js 2013-02-26 18:40:25 +00:00
Dale Karp
ac38917977 bah 2013-02-22 18:48:28 +00:00
Dale Karp
ef1a8e9d86 now have ScaleRaphael building properly 2013-02-21 17:59:48 +00:00
Dale Karp
87a078e655 renamed scale.raphael.js to be less confusing 2013-02-21 17:32:25 +00:00
Dale Karp
e8964362ca adding new raphael scale library 2013-02-21 17:11:15 +00:00
Markos Calderon
bdccc4eee7 html5 branch updated with the latest changes from the master 2013-01-29 20:24:36 -05:00
Markos Calderon
5348a4892a check if the browser supports websockets 2013-01-23 11:40:12 -05:00
Markos Calderon
e104941d54 Changes for sync users 2013-01-22 17:56:17 -05:00
Calvin Walton
07357ce15b Demonstration code for video view 2013-01-15 18:11:05 +00:00
Leonardo Crauss Daronco
950c7bf8f5 First changes to make the html5 client look good in an iPad
Smaller presentation, chat always visible, user list on top of chat.
2013-01-05 21:40:29 -02:00
Leonardo Crauss Daronco
1ef17be130 Fix wrong cursor position when presenter
Container dimensions were not set when the first slide was added to the screen.
2012-12-19 16:54:11 -02:00
Leonardo Crauss Daronco
98d4cba3c8 Use r.js to optimize the html5 client
Development works as it was before. In production the js file loaded is the optimized one.

Had to wrap the colorwheel plugin in a define() call.
jQuery now is always loaded from googleapis, the local files were removed.
2012-12-19 16:42:58 -02:00
Leonardo Crauss Daronco
45a264a211 Fix the dimensions of the container at WhiteboardPaper
They were always 0x0 at startup until the page was resized.
2012-12-17 18:25:54 -02:00
Leonardo Crauss Daronco
423bbcf41e Fix selection of users in the user list 2012-12-17 17:51:12 -02:00
Leonardo Crauss Daronco
c42d6c29ae Fix the position of the cursor when the html5 clients is the presenter 2012-12-17 17:45:15 -02:00
Leonardo Crauss Daronco
27c8a7abde Increase requirejs's timeout to 60 secs (for iPads)
For some reason an iPad takes ~30 seconds to load the initial page.
2012-12-17 17:15:26 -02:00
Leonardo Crauss Daronco
036e77f559 Split the session template into smaller templates rendered by the subviews 2012-12-14 22:58:14 -02:00