3403 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Juriy Zaytsev	2d38f9eb22	Merge pull request #2257 from asturur/clean-origins ... Clean origins	2015-06-09 01:30:00 -04:00
Andrea Bogazzi	a745e41849	Added rotation logic to getLocalPointer, removed no more usefull getLocalRotatedPointer	2015-06-08 07:59:07 +02:00
Andrea Bogazzi	b22ae4f37a	Update object_origin.mixin.js	2015-06-08 00:32:03 +02:00
Juriy Zaytsev	9b20770f0a	Merge pull request #2267 from asturur/Add-test-to-origins ... Add 100+ test to object origin mixin	2015-06-07 18:18:55 -04:00
Andrea Bogazzi	6cc36ccdff	Update object_origin.mixin.js	2015-06-07 10:04:00 +02:00
Andrea Bogazzi	f998fa496e	Update test.js	2015-06-07 10:02:48 +02:00
Andrea Bogazzi	00b077cc33	Merge pull request #17 from kangax/master ... Update to master	2015-06-07 04:12:45 -03:00
inssein	4843a61a84	need to figure out how to get phpstorm to auto format these mistakes	2015-06-03 17:07:42 -07:00
inssein	4987b55ed6	formatted	2015-06-03 16:49:38 -07:00
inssein	bf7f2ea731	1) adjust index when clicking on end of line ... 2) measure text in a line properly	2015-06-03 16:39:10 -07:00
inssein	2b3c75b6b1	fix selection and up + down movements	2015-06-03 11:31:02 -07:00
Juriy Zaytsev	d817ae6f63	Merge pull request #2256 from asturur/fix-style-parsing ... Fix style parsing	2015-06-03 14:13:38 -04:00
Juriy Zaytsev	023d2937f7	Merge pull request #2101 from sapics/fix_group_to_object ... Fix group initialization	2015-06-03 12:42:51 -04:00
sapics	e07350c9e7	fix group initialization	2015-06-03 08:45:19 +09:00
Andrea Bogazzi	452383594a	Update parser.js	2015-06-02 23:05:54 +02:00
Andrea Bogazzi	3b460d9034	Fix fore removing last ; followed by spaces	2015-06-02 22:31:54 +02:00
Andrea Bogazzi	7a214b6864	Merge pull request #16 from kangax/master ... sync to master	2015-06-02 17:28:30 -03:00
inssein	d08dabc2ab	forgot setOnGroup additions	2015-05-31 22:45:33 -07:00
inssein	3e57b2a835	changes requested by kangax	2015-05-31 15:44:44 -07:00
inssein	a641dbf8f9	silly formatting rules :P	2015-05-28 22:41:23 -07:00
inssein	b9aa3500a2	formatting	2015-05-27 21:30:17 -07:00
inssein	8934b93bc7	Change the get2DCursorLocation() function to return appropriately. Added additional comments for clarity.	2015-05-27 20:24:06 -07:00
inssein	b036092ff0	Merge remote-tracking branch 'origin/textbox' into textbox	2015-05-27 20:17:50 -07:00
inssein	5991fb085b	use _splitTextIntoLines() everywhere	2015-05-27 20:16:26 -07:00
inssein	b7275de184	adhere to 120 character limit	2015-05-27 15:30:40 -07:00
inssein	30a95ae1e4	forgot to set proper style guide when auto-formatting	2015-05-27 15:30:40 -07:00
inssein	84adfa180b	revert filemode changes	2015-05-27 15:30:40 -07:00
inssein	4cb3923279	typo..	2015-05-27 15:30:40 -07:00
inssein	1718c266bd	missed main textbox class, and autoformatted changes.	2015-05-27 15:30:40 -07:00
inssein	489eb1bddf	Textbox implementaion from Jaffer Haider, with one minor change in textbox_key_behavior	2015-05-27 15:30:40 -07:00
Juriy Zaytsev	f0fcd770bd	Merge pull request #2238 from inssein/image_init_config ... image.class.js not properly calling _initConfig when initializing	2015-05-27 17:30:07 -04:00
inssein	bb32d78db1	adhere to 120 character limit	2015-05-27 14:18:52 -07:00
inssein	1067ac028a	forgot to set proper style guide when auto-formatting	2015-05-27 13:59:56 -07:00
inssein	502259a946	Fix bug with image.class.js not properly calling _initConfig when initializing.	2015-05-27 13:47:06 -07:00
inssein	8c7ce62b81	revert filemode changes	2015-05-27 13:30:35 -07:00
inssein	49a893d06f	typo..	2015-05-27 11:47:45 -07:00
inssein	1062fdb26e	missed main textbox class, and autoformatted changes.	2015-05-27 11:47:13 -07:00
inssein	a1e578b137	Textbox implementaion from Jaffer Haider, with one minor change in textbox_key_behavior	2015-05-27 11:44:53 -07:00
Juriy Zaytsev	697d17bd70	Merge pull request #2227 from sapics/fix-unit-test ... fix unit test error in google chrome	2015-05-23 12:18:36 -04:00
sapics	79db396d3a	fix unit test error in google chrome	2015-05-23 08:47:42 +09:00
Juriy Zaytsev	4c2dd702d3	Merge pull request #2223 from asturur/master ... Fix deleting forward at end of text.	2015-05-21 11:51:14 -04:00
kangax	ff1b4e206c	Fix JSHint warnings, make it catch console.log	2015-05-21 11:47:12 -04:00
Andrea Bogazzi	04d398e675	Update itext_key_behavior.mixin.js	2015-05-21 15:08:20 +02:00
Juriy Zaytsev	d2600f47c8	Merge pull request #2214 from asturur/itext-cursorposition ... Fix cursor postion click on end of line	2015-05-19 19:01:11 -04:00
Andrea Bogazzi	93c9018580	Update itext_click_behavior.mixin.js	2015-05-19 23:36:01 +02:00
Andrea Bogazzi	d659f16a44	Update itext_click_behavior.mixin.js	2015-05-19 23:24:09 +02:00
Juriy Zaytsev	b3874d2bc9	Merge pull request #2207 from asturur/fix-itext-test ... Fix itext test for browser	2015-05-18 17:10:21 -04:00
Andrea Bogazzi	286e018e3a	Update itext.js ... fix test for browser	2015-05-18 22:58:21 +02:00
Andrea Bogazzi	dd769a98cf	Merge pull request #14 from kangax/master ... update master	2015-05-18 22:55:40 +02:00
Juriy Zaytsev	106b0a551c	Merge pull request #2206 from asturur/boundingboxes ... dimensions code refactor	2015-05-18 15:57:15 -04:00