Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-25 21:53:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3162 commits 27 branches 86 tags 119 MiB
Commit graph

2070 commits

Author SHA1 Message Date
Andrea Bogazzi
0edd147b0e Update group.class.js 2015-08-08 14:30:24 +02:00
Andrea Bogazzi
0a550efcd3 Update itext_behavior.mixin.js 2015-08-08 10:49:28 +02:00
Andrea Bogazzi
94ab565da9 Update object_interactivity.mixin.js 2015-08-07 11:09:11 +02:00
Andrea Bogazzi
1dc1271495 Update itext_click_behavior.mixin.js 2015-08-07 11:05:17 +02:00
Juriy Zaytsev
fe087a0ceb Merge pull request #2389 from asturur/fix-double-measu 
Removed unnecessary call to ctx.measureText
 2015-08-06 10:37:11 -04:00
Andrea Bogazzi
36554dbcaa Update itext.class.js 2015-08-06 09:23:26 +02:00
Juriy Zaytsev
5dcedda455 Build dist, update packages 2015-08-04 19:31:27 -04:00
Juriy Zaytsev
44eb376fc8 Merge pull request #2370 from asturur/fix-textboxcursor 
Remove duplicate code and fix justify style issue
 2015-07-31 13:28:48 -04:00
Andrea Bogazzi
27b5d2b0fd Update textbox.class.js 2015-07-29 13:04:25 +02:00
Juriy Zaytsev
f1e59c0d14 Merge pull request #2368 from asturur/fix-textboxcursor 
Fix text itext code
 2015-07-29 01:34:27 -04:00
Andrea Bogazzi
2518a486c3 Update textbox.class.js 2015-07-28 19:20:14 +02:00
Andrea Bogazzi
29f601512b Update text.class.js 
Removed direct use of __lineWidths
 2015-07-28 19:05:21 +02:00
Andrea Bogazzi
43500f77f4 Update object_geometry.mixin.js 2015-07-24 10:12:45 +02:00
Juriy Zaytsev
3b99fc11ff Merge pull request #2353 from asturur/simpler-setCoords 
Simpler setCoords
 2015-07-22 08:59:28 -04:00
Juriy Zaytsev
2cedb1cc90 Merge pull request #2354 from asturur/fix-text-glitche 
Fix text glitche
 2015-07-22 08:40:25 -04:00
Andrea Bogazzi
22d9f8d62a Update text.class.js 2015-07-22 11:01:45 +02:00
Andrea Bogazzi
76284b27cd Update text.class.js 
draft
 2015-07-22 10:57:16 +02:00
Andrea Bogazzi
a9c054d58b Update object_interactivity.mixin.js 2015-07-21 17:48:27 +02:00
Andrea Bogazzi
538d4eed50 Update object_geometry.mixin.js 2015-07-21 17:47:14 +02:00
Andrea Bogazzi
4b387b744f Update itext_key_behavior.mixin.js 2015-07-21 17:14:33 +02:00
Andrea Bogazzi
c545075122 Update itext_key_behavior.mixin.js 2015-07-21 14:35:41 +02:00
Andrea Bogazzi
520324d261 Update object_geometry.mixin.js 2015-07-21 14:34:34 +02:00
Juriy Zaytsev
3907853048 Update textbox documenation 2015-07-20 13:56:26 -04:00
Juriy Zaytsev
20e97924f4 Make sure image props are output properly 2015-07-20 13:56:20 -04:00
Juriy Zaytsev
614878d133 Merge pull request #2350 from asturur/exportTransformMa 
export Transfor Matrix in toObject
 2015-07-20 11:45:08 -04:00
Juriy Zaytsev
aba1b0e8f8 Merge pull request #2347 from asturur/fixes-textbox 
Some fixes to textbox
 2015-07-20 11:11:59 -04:00
Andrea Bogazzi
215ed8b9b8 Merge pull request #24 from kangax/master 
asd
 2015-07-20 01:23:17 +02:00
Andrea Bogazzi
8573c755b6 Update object.class.js 2015-07-18 00:50:56 +02:00
Juriy Zaytsev
2171dd1379 Output less irrelevant information in fabric.Image#toObject 2015-07-17 17:42:30 -04:00
Juriy Zaytsev
1499d34b1e Merge pull request #2348 from asturur/fix-pathgroup-parsing 
Fix parsing pathgroup dimensions from inner paths
 2015-07-17 11:31:42 -04:00
Andrea Bogazzi
21d9ddf9e4 Update path_group.class.js 2015-07-17 17:27:28 +02:00
Juriy Zaytsev
f45291cf42 Merge pull request #2345 from asturur/restore-parser 
Restore parsing svg elements as a parent in caso of use tag plus svg tag
 2015-07-17 10:43:31 -04:00
Juriy Zaytsev
4c915f17c6 Merge pull request #2349 from asturur/shadowcolor-su 
add support for shadow colors in svg
 2015-07-17 10:35:24 -04:00
Andrea Bogazzi
8f14daaba8 Update textbox.class.js 2015-07-17 14:17:53 +02:00
Andrea Bogazzi
e41088329d Update shadow.class.js 2015-07-17 14:13:21 +02:00
Andrea Bogazzi
f519bd422a Update parser.js 2015-07-17 11:36:41 +02:00
Andrea Bogazzi
d9d8c715fd Update parser.js 2015-07-17 09:48:46 +02:00
Juriy Zaytsev
5fe5db377b Merge pull request #2340 from asturur/fix-itextcopypaste 
Fix itextcopypaste
 2015-07-15 13:31:04 -04:00
Andrea Bogazzi
5be39487e9 Update itext_key_behavior.mixin.js 2015-07-15 19:03:43 +02:00
Juriy Zaytsev
73eb7a6ac8 Merge pull request #2342 from asturur/fix-shiftclick-activegroup 
Fix shiftclick activegroup
 2015-07-15 12:41:52 -04:00
Andrea Bogazzi
d36945f6e2 Update path.class.js 2015-07-15 16:50:25 +02:00
Andrea Bogazzi
a1b853e1d7 Update canvas.class.js 2015-07-15 15:08:54 +02:00
Juriy Zaytsev
18e87d9d59 Merge pull request #2337 from asturur/master 
fix imageSmoothing glitches
 2015-07-14 11:00:29 -04:00
Andrea Bogazzi
1e7616009d fix imageSmoothing glitches 2015-07-14 16:51:43 +02:00
Juriy Zaytsev
ed3264a72e Merge pull request #2335 from asturur/fix-pattern-toObject 
Fix pattern to object
 2015-07-14 10:29:11 -04:00
Juriy Zaytsev
033402d06d Merge pull request #2336 from asturur/itext-paste 
Itext paste
 2015-07-14 10:27:37 -04:00
Andrea Bogazzi
8f547d91c1 Update itext_key_behavior.mixin.js 2015-07-14 13:09:13 +02:00
Andrea Bogazzi
fbd3f174b5 Update pattern.class.js 2015-07-14 12:23:23 +02:00
Juriy Zaytsev
8791741c9f Merge pull request #2237 from inssein/textbox 
Textbox Implementation - from Jaffer Haider
 2015-07-13 18:34:58 -04:00
Juriy Zaytsev
c7c9d24ebb Fix linter 2015-07-10 16:04:34 -04:00
Juriy Zaytsev
713c19335a Merge pull request #2328 from ChrisBuergi/animate-color 
Added simple color animation utility.
 2015-07-10 15:49:48 -04:00
Juriy Zaytsev
fb22168f48 Add support for hidpi rendering on retina screens 
Closes #316
 2015-07-10 11:13:51 -04:00
Chris Buergi
971166978c Added simple color animation utility. 2015-07-08 15:04:16 +02:00
Juriy Zaytsev
65c29807b6 Merge pull request #2310 from asturur/fix-text-opacity 
Fix text opacity
 2015-07-03 12:50:10 -04:00
Andrea Bogazzi
2315fafde1 Update parser.js 2015-06-26 12:07:03 +02:00
Andrea Bogazzi
23eff30d1b Update text.class.js 2015-06-26 11:47:04 +02:00
inssein
e7b01abf73 fix CS 2015-06-18 20:06:32 -07:00
inssein
3902442ebf finally installed jscs and ran it to fix all errors 2015-06-16 13:54:03 -07:00
inssein
5daab00d69 fix off by one errors when calculating the offset 2015-06-16 13:19:41 -07:00
inssein
5824a48268 bringing over fixes from application textbox 2015-06-16 10:34:08 -07:00
Juriy Zaytsev
ebd2135b08 Merge pull request #2278 from sapics/fix-undefined-function 
fix undefined function call
 2015-06-16 13:01:07 -04:00
Hussein Jafferjee
deecc9df4c fix callSuper()'s inside mixins 2015-06-15 14:04:42 -07:00
Hussein Jafferjee
43668e3571 Fix cursor location to include spaces that are removed 2015-06-15 14:01:57 -07:00
Hussein Jafferjee
4c17f358e5 Properly detect where a click happens inside a textbox 2015-06-15 13:57:40 -07:00
Hussein Jafferjee
1db7e953c2 Fix bug in stylemap generation 2015-06-15 13:55:12 -07:00
Hussein Jafferjee
ea81c0f1e9 Account for removed space's at end of line when wrapping 2015-06-12 10:26:36 -07:00
Hussein Jafferjee
c158e311df Update textbox.class.js 
Overlooked simple case - do not add word that is too long onto a line that already contains text.
 2015-06-12 09:26:21 -07:00
sapics
f5b4605032 remove unused variables 2015-06-12 13:40:39 +09:00
inssein
26bba123af dont wrap when its smaller than a single word. 2015-06-11 20:00:23 -07:00
Juriy Zaytsev
74d05ed8f3 Merge pull request #2274 from asturur/clean-origins 
forgot some cleaning
 2015-06-11 22:07:06 -04:00
inssein
079a6f4e30 fix styles when measuring 2015-06-11 10:55:18 -07:00
inssein
7b581b4753 CS 2015-06-11 10:25:43 -07:00
inssein
0cf09986ee fix insertCharStyleObject so that it deletes properly 2015-06-11 10:21:37 -07:00
Juriy Zaytsev
2d2712c784 Merge pull request #2128 from asturur/pointer-in-scrollable 
fix getScrollLeftTop
 2015-06-11 10:46:54 -04:00
inssein
ce1023e709 whoops 2015-06-11 00:01:37 -07:00
Andrea Bogazzi
47dbb2303b Update object_origin.mixin.js 2015-06-11 08:19:08 +02:00
sapics
f556ab9411 function name fix 2015-06-11 13:45:01 +09:00
sapics
7e9f17186f just code simpler 2015-06-11 11:16:41 +09:00
inssein
9eb597c729 Use this.styles as if it's not affected by line-wraps. 2015-06-10 17:12:54 -07:00
Andrea Bogazzi
6ca7a5969c Update object_origin.mixin.js 2015-06-10 18:05:24 +02:00
Juriy Zaytsev
0d83da0e29 Merge pull request #2269 from asturur/fix-rotated-poi 
Fix rotated pointer
 2015-06-10 11:59:22 -04:00
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
Andrea Bogazzi
6cc36ccdff Update object_origin.mixin.js 2015-06-07 10:04:00 +02: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
sapics
e07350c9e7 fix group initialization 2015-06-03 08:45:19 +09:00
Andrea Bogazzi
3b460d9034 Fix fore removing last ; followed by spaces 2015-06-02 22:31:54 +02: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
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
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
inssein
502259a946 Fix bug with image.class.js not properly calling _initConfig when initializing. 2015-05-27 13:47:06 -07: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
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
106b0a551c Merge pull request #2206 from asturur/boundingboxes 
dimensions code refactor
 2015-05-18 15:57:15 -04:00
Andrea Bogazzi
a4cb8879fc Update object_interactivity.mixin.js 2015-05-18 21:44:12 +02:00
Juriy Zaytsev
37720eaeab Merge pull request #2204 from asturur/fixtextstylec 
Add a bool to force cache clear on next render
 2015-05-18 11:54:44 -04:00
kangax
c35ec9459d Fix fabric.Circle#setRadius not returning circle. Closes #2196 2015-05-18 11:15:09 -04:00
Andrea Bogazzi
cfd7521482 Update text.class.js 2015-05-18 08:16:04 +02:00
Ulrich Sossou
a60adb6e41 Set default value of strokeDashArray so SVG is valid 2015-05-17 09:12:55 +01:00
kangax
bf0bdd4c59 Add isDrawingMode to docs. Closes #2072 2015-05-14 08:30:11 -04:00
Juriy Zaytsev
ca50ab90a5 Merge pull request #2163 from kibao/fix/node-segmentation-fault 
node.js segmentation fault when image couldn't be loaded
 2015-05-13 11:47:06 -04:00
Milan Wanielik
e5e15e4390 fix code style error, that somehow got reintroduced by merge 2015-05-13 10:43:14 +02:00
Milan Wanielik
2cb0de11e1 Merge branch 'master' into fix/duplicate-line-styles 
Conflicts:
	src/mixins/itext_behavior.mixin.js
	test/unit/itext.js
 2015-05-13 09:46:35 +02:00
Juriy Zaytsev
d596089884 Merge pull request #2191 from milan-w/fix/insertNewlineStyleObject 
Fix insertNewlineStyleObject failing, when lineIndex is not present in style object
 2015-05-13 02:39:47 -04:00
Juriy Zaytsev
905b21826a Merge pull request #2186 from asturur/fix-elementByID-ie9 
Add alternative to get elementById for ie9
 2015-05-13 02:32:23 -04:00
Andrea Bogazzi
734cea4780 Update parser.js 2015-05-13 08:27:23 +02:00
Andrea Bogazzi
de4449231d Add alternative to get elementById 2015-05-13 07:53:13 +02:00
Milan Wanielik
5192f72762 adjust code style 2015-05-12 13:47:58 +02:00
Milan Wanielik
2086e28f14 fix code style error 2015-05-12 13:46:55 +02:00
Milan Wanielik
0d5ad0cec4 remove insertNewlineStyleObject fixes, one issue per branch 2015-05-12 12:04:55 +02:00
Milan Wanielik
b3c57385f2 remove shiftLineStyles fixes, one issue per branch 2015-05-12 12:02:15 +02:00
Milan Wanielik
c824c8a8da fixes mainly for fabric on canvas: fix insertNewlineStyleObject, check if currentChar lineIndex exists; fix shiftLineStyles, delete previous lines after shifting 2015-05-11 18:46:44 +02:00
Juriy Zaytsev
c71a1c2049 Merge pull request #2183 from asturur/Fix-patterns-for-text 
Fix patterns offset for text
 2015-05-10 23:26:22 -04:00
Andrea Bogazzi
5b429185f7 Update text.class.js 
avoid ruining the stack on offsetX and offsetY equal to 0
 2015-05-10 18:51:31 +02:00
Andrea Bogazzi
323c648961 Update text.class.js 2015-05-09 11:05:54 +02:00
Andrea Bogazzi
1f84378565 obect stroke restoring was missing 2015-05-09 11:05:05 +02:00
Juriy Zaytsev
934fe4782f Merge pull request #2175 from asturur/fix-itext-selection 
fix selection itext transformatrix
 2015-05-08 18:27:35 -04:00
Juriy Zaytsev
264d73cdbf Merge pull request #2178 from sapics/fix-stroke-width-calculation 
Fix stroke width calculation. Closes #2177
 2015-05-08 18:05:41 -04:00
Juriy Zaytsev
04722f976d Merge pull request #2173 from asturur/object-restore 
Avoid restoring properties manually that are handled by canvas save stack
 2015-05-08 17:59:44 -04:00
sapics
d459a87ae2 Fix stroke width calculation 2015-05-08 16:29:14 +09:00
Andrea Bogazzi
9691acdc2c Update object.class.js 2015-05-08 08:29:03 +02:00
Andrea Bogazzi
902b44dbda a 2015-05-07 08:40:54 +02:00
kibao
69d616ad23 Node.js Invoke loadImage callback if there is no data or a network error 2015-05-06 21:34:41 +02:00
Andrea Bogazzi
5ba6b54787 Update dom_misc.js 2015-05-05 14:05:04 +02:00
Andrea Bogazzi
02dca44656 Update group.class.js 2015-05-05 12:54:53 +02:00
Juriy Zaytsev
68915cbcb6 Merge pull request #2164 from asturur/Fix-Image-from-Object 
Fix image resize filter from object
 2015-05-05 11:47:57 +02:00
Andrea Bogazzi
ed5b1b66b0 Fix image resize filter from object 2015-05-05 08:32:30 +02:00
Andrea Bogazzi
80c3012646 Update object_origin.mixin.js 2015-05-02 19:13:44 +02:00
kibao
7515fcedbe Don't create image data Buffer when data is empty 
Fix for segmentation fault when image couldn't be loaded
 2015-04-30 19:51:47 +02:00
Juriy Zaytsev
91897de495 Merge pull request #2153 from asturur/iTextGlitch 
I text glitches fix
 2015-04-29 13:17:17 +02:00
Andrea Bogazzi
bedc38ec19 fix spaces 2015-04-29 13:10:25 +02:00
Andrea Bogazzi
ba94729f29 removed global var and split(''); 2015-04-29 12:51:25 +02:00
Andrea Bogazzi
4bed22f4a9 iText clean up and style fixes 2015-04-29 08:27:56 +02:00
Paul Kaplan
34d490c1a0 Don't import elements declared within <metadata> 
Some SVG files declare elements inside of the metadata block. Don’t
import them.
 2015-04-28 16:12:50 -05:00