Commit Graph

66 Commits

Author SHA1 Message Date
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
Leonardo Crauss Daronco
f29b73c16c Prefix private methods with an underline and remove unecessary files 2012-12-14 22:41:30 -02:00
Leonardo Crauss Daronco
2577123726 Migrate the form validation on login to LoginView 2012-12-14 22:16:25 -02:00
Leonardo Crauss Daronco
d795a56c93 Allow page refreshes and redirect the user to the session when already logged in
User authentication now through /auth (GET|POST). /chat removed.
Increased the time limit for a user to be logged out from 1sec to 5secs (the pages take a bit longer to load now).
2012-12-14 22:03:38 -02:00
Leonardo Crauss Daronco
4b80352e8e Move the last methods to the new models/views, and remove the old js files
Also updated jQuery UI css to v1.9.2, using the theme ui-lightness
2012-12-13 23:54:10 -02:00
Leonardo Crauss Daronco
c562f5cd85 Methods to draw in the whiteboard migrated to views/models 😓
Almost everything migrated now, even though not everything's working 100% yet.
2012-12-13 17:35:57 -02:00
Leonardo Crauss Daronco
fdc12ccb6c Add a toolbar on top os slides with actions that are not yet in the main navbar
Such as the upload of slides.
2012-12-13 15:26:02 -02:00
Leonardo Crauss Daronco
a397e2be63 Color picker working
colorwheel.js code updated to jweir/colorwheel@be140fb2f8
This version allows the colorwheel to be inside a DOM element and has built-in integration with a text input.
2012-12-13 00:04:43 -02:00
Leonardo Crauss Daronco
9938e11662 Presentation zooming and fitting migrated to the new models/views 2012-12-12 23:02:35 -02:00
Leonardo Crauss Daronco
a0753ab4f3 Move a few more methods from the old js files to new models/views 2012-12-12 00:15:14 -02:00
Leonardo Crauss Daronco
152e601e54 Cursor movement and slide changes now working 2012-12-11 19:15:08 -02:00
Leonardo Crauss Daronco
2e2a37c6f8 Drawing functions now available in WhiteboardPaperModel
Actions (drawings) in the whiteboard are now shown in the html5 client.
2012-12-11 18:48:38 -02:00
Leonardo Crauss Daronco
bbe1c63c9f Basic whiteboard functionality in a new view and model
All it can do for now is initialize the Raphel objects and show the slide images in the screen.
2012-12-11 17:37:32 -02:00
Leonardo Crauss Daronco
79d88135ab More options in the authentication object stored in the client
Authentication object is stored during the session, with data (currently with meetingID and username) sent by the server.
2012-12-10 23:51:01 -02:00
Leonardo Crauss Daronco
b11f12eb16 User list with selection of users and set presenter working 2012-12-10 23:29:56 -02:00
Leonardo Crauss Daronco
308ddb691d Treat more socket.io events: login, logout and chat now working with backbone 2012-12-10 16:28:30 -02:00
Leonardo Crauss Daronco
8ca78dd83e Split SessionView in subviews and add treatment to basic events
Events that were in chat/behaviour.coffee are now in Backbone views.
2012-12-10 14:34:06 -02:00