Gary Deng
f04c048526
After clearShape,currentshape should not be null
2013-08-01 08:57:17 -07:00
Gary Deng
17881b19ee
remove unnecessary changes
2013-08-01 08:27:22 -07:00
Gary Deng
ebe17628f5
send undo and clrPaper events to html5-client, and enable html5-client to see square while Ctrl keypressed
2013-08-01 08:10:59 -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
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
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
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
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
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
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
f29b73c16c
Prefix private methods with an underline and remove unecessary files
2012-12-14 22:41:30 -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
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