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

1973 commits

Author SHA1 Message Date
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
Incuuu
21df5e8fe7 Change the firing order of mouse:out/mouse:over events 2015-04-24 18:44:02 +04:00
Incuuu
935fd4f39d Add MouseEvent in mouse:over/mouse:out events 2015-04-23 14:32:17 +04:00
Juriy Zaytsev
46cd6ab505 Merge pull request #2137 from jafferhaider/Issue510PullRequest 
Added missing events in multi-touch gestures. Closes #510
 2015-04-22 15:07:23 +02:00
Juriy Zaytsev
150216ebf5 Merge pull request #2127 from asturur/fix-_getLeftTop 
Change getTopLeftCoords
 2015-04-22 13:23:24 +02:00
Juriy Zaytsev
3586cb26f7 Merge pull request #2141 from asturur/fixThis.Canvas 
Make .canvas property always present
 2015-04-22 13:17:38 +02:00
Juriy Zaytsev
54211dd349 Merge pull request #2130 from asturur/ActiveGroupSorter 
Fix sortedObjects
 2015-04-22 13:05:53 +02:00
Jaffer Haider
8a73c34e7c code style errors 2015-04-22 09:12:59 +05:00
Andrea Bogazzi
5ab3b331c7 Update static_canvas.class.js 2015-04-22 05:50:11 +02:00
Andrea Bogazzi
0465729c15 Update group.class.js 2015-04-22 05:49:23 +02:00
Jaffer Haider
0897ff1d16 Added missing events from gestures 2015-04-21 14:40:18 +05:00
Andrea Bogazzi
906ee8684e Update static_canvas.class.js 2015-04-21 09:09:16 +02:00
Andrea Bogazzi
344f4c9f41 Update static_canvas.class.js 2015-04-21 08:56:38 +02:00
sapics
fe65503e11 fix only coding style 2015-04-21 09:53:19 +09:00
Andrea Bogazzi
09d13c6e7c Fix sortedObjects 2015-04-20 12:48:37 +02:00
sapics
563ec42196 fix space and linebreak 2015-04-20 09:51:32 +09:00
Andrea Bogazzi
5d75b53ab4 fix getScrollLeftTop 2015-04-19 20:30:46 +02:00
Andrea Bogazzi
6d1f9a3f08 Update object_origin.mixin.js 2015-04-19 20:25:23 +02:00
Juriy Zaytsev
a5baf7ae39 Merge pull request #2117 from sapics/fix_path_initialize 
Fix path initialize
 2015-04-19 18:01:39 +02:00
Juriy Zaytsev
a07e0c2367 Merge pull request #2121 from asturur/group-init 
Group init
 2015-04-17 13:13:08 +02:00
Andrea Bogazzi
ef1036b58e Update group.class.js 2015-04-17 03:35:59 +02:00
Andrea Bogazzi
6c24ec06f6 Update object.class.js 2015-04-17 01:24:05 +02:00
Andrea Bogazzi
75142bd9c0 Update object.class.js 2015-04-16 21:11:02 +02:00
sapics
d922771915 Add @param comment 2015-04-16 18:47:04 +09:00
sapics
64529b4562 fix of @asturur suggestion 2015-04-16 18:31:52 +09:00
sapics
05316fc0f9 fix path initialize function for option left=0 or top=0 2015-04-16 17:11:06 +09:00
Juriy Zaytsev
b2ee0b14c6 Merge pull request #2102 from asturur/fix-cursor 
Fix cursor AND selection
 2015-04-14 18:15:14 +02:00
Juriy Zaytsev
c1dfa0ed4b Merge pull request #1856 from finfin/master 
Fix requireJS compatibility issue
 2015-04-14 18:07:10 +02:00
Andrea Bogazzi
5cdecb27d0 Update text.class.js 
removed unused method
 2015-04-14 17:57:44 +02:00
Andrea Bogazzi
fb50a4f366 Fix cursor AND selection 2015-04-14 15:41:32 +02:00
Juriy Zaytsev
d71eb73364 Merge pull request #2099 from asturur/fix-shadow-svg 
simple correction on shadow toSVG
 2015-04-08 18:40:20 +02:00
Andrea Bogazzi
f505e753ca simple correction 2015-04-08 15:41:35 +02:00
Juriy Zaytsev
20f44aa033 Merge pull request #2093 from asturur/drawBorders 
avoid unnecesary save and restore per object
 2015-04-08 09:35:24 +02:00
Andrea Bogazzi
d7f0fea8a2 avoid unnecesary save and restore per object 2015-04-08 09:08:05 +02:00
Andrea Bogazzi
d593d209aa Update path.class.js 2015-04-08 08:20:49 +02:00
Juriy Zaytsev
8dfaaab514 Merge pull request #2091 from asturur/multiplyMatrice 
Shorter version of multiply transform matrix
 2015-04-07 18:55:17 +02:00
Juriy Zaytsev
ac6b3d21e0 Merge pull request #2090 from Incuuu/bug/setBackgroundImage 
Fix bug with options of image instance in setBackgroundImage
 2015-04-07 14:14:43 +02:00
Incuuu
fa5bba0df7 Fix problem with empty options 2015-04-07 15:00:11 +04:00
Andrea Bogazzi
320a08faa1 bunch of spaces for jscs 2015-04-06 23:29:29 +02:00
Andrea Bogazzi
364bc29a5e Shorter version of multiply transform matrix 2015-04-06 23:18:15 +02:00
Juriy Zaytsev
506f4dfa47 Merge pull request #2069 from asturur/svgParsing 
Parse svg with 100% dimension or missing dimensions
 2015-04-06 21:24:47 +02:00
Juriy Zaytsev
75452223e8 Merge pull request #2089 from asturur/fix-text-parser 
Clean text from svg
 2015-04-06 18:44:52 +02:00
Incuuu
84adc7b4d3 Fix bug with options of image instance in setBackgroundImage 2015-04-06 18:54:51 +04:00
Andrea Bogazzi
426ce2a31a Update text.class.js 2015-04-06 14:24:26 +02:00
Andrea Bogazzi
45273cd04c Clean text from svg 2015-04-06 14:17:51 +02:00
Andrea Bogazzi
ddbf256d94 Update path_group.class.js 2015-04-06 12:57:09 +02:00
Andrea Bogazzi
affb15d7ec Update path_group.class.js 2015-04-06 12:24:32 +02:00
Juriy Zaytsev
5f988a2600 Merge pull request #2083 from asturur/changes-in-rendering 
Changes in rendering
 2015-04-06 02:52:41 +02:00
Juriy Zaytsev
caaa99b553 Merge pull request #2086 from asturur/transformPoint 
Correct transformPoint Function
 2015-04-06 02:51:38 +02:00
Andrea Bogazzi
48e83f4a7a Update parser.js 2015-04-06 01:36:00 +02:00
Andrea Bogazzi
8747ed1bd6 Update misc.js 2015-04-05 21:34:58 +02:00
Juriy Zaytsev
e932be0a15 Merge pull request #2081 from asturur/renderCursor 
Render cursor - fix for viewportTransfrom
 2015-04-05 18:00:50 +02:00
Juriy Zaytsev
29b7701142 Merge pull request #2082 from asturur/drawControl-change 
Update drawControl
 2015-04-04 15:17:05 +02:00
Andrea Bogazzi
e15fcd4056 Update group.class.js 2015-04-04 14:17:22 +02:00
Andrea Bogazzi
1550c9d154 Update object.class.js 2015-04-04 14:12:02 +02:00
Andrea Bogazzi
a7271aaf9f Update path.class.js 2015-04-04 13:50:39 +02:00
Andrea Bogazzi
b932cc2eb1 Update path_group.class.js 2015-04-04 13:48:07 +02:00
Andrea Bogazzi
26b91222e9 Update object.class.js 2015-04-04 13:45:50 +02:00
Andrea Bogazzi
3e96328c26 Update text.class.js 2015-04-04 13:45:21 +02:00
Andrea Bogazzi
37d5e63380 Update itext.class.js 2015-04-04 13:22:37 +02:00
Andrea Bogazzi
dff6ab94eb Update drawControl 2015-04-04 12:36:18 +02:00
Andrea Bogazzi
50e1d574e5 fixes cursor position with viewporttransform 2015-04-04 11:24:38 +02:00
Andrea Bogazzi
b6687f069a Update itext.class.js 2015-04-02 13:23:37 +02:00
Juriy Zaytsev
ebe2f687c1 Merge pull request #2075 from asturur/fixSVGimpor 
Fix transform matrix of particular complex situation
 2015-04-01 01:16:01 +02:00
Andrea Bogazzi
950fdbd89e Fix transform matrix of particular complex situation 2015-03-31 23:59:18 +02:00
Jim Rodovich
5d4fa49cd3 Fix hit detection on the active group after zooming. 2015-03-31 11:51:04 -05:00
Juriy Zaytsev
1257c52a87 Merge pull request #2065 from asturur/renderCursor 
Render cursor on upper canvas
 2015-03-31 13:38:57 +02:00
Juriy Zaytsev
e43ebdfea7 Merge pull request #2068 from asturur/fix-jscs 
attemp to fix jscs crash
 2015-03-31 12:57:31 +02:00
Andrea Bogazzi
f03c9d244b Modify cursor tick 2015-03-31 01:47:53 +02:00
Andrea Bogazzi
568e2ed2c0 attemp to fix jscs crash 2015-03-31 01:46:38 +02:00
kangax
92154f7a16 Update JSCS, fix style issues 2015-03-30 12:05:49 +02:00
sapics
c90062c78e Remove overlap definition of setAngle in jsdoc 2015-03-30 10:27:08 +09:00
sapics
f52eee78e4 remove unused variable 2015-03-30 10:26:48 +09:00
Juriy Zaytsev
889efa1c4a Merge pull request #1999 from StileEducation/PR_toJSON_selection 
Make toJSON/toSVG behave sensibly with an active selection group
 2015-03-25 13:02:22 +01:00
KJ Tsanaktsidis
7453776856 Call set() when unwinding the group transform 
set() is called when the group transform is realized by the group
on the object, so set needs to be called when the inverse operation
is done too so that things watching these properties see both the
action and the undo.
 2015-03-25 11:23:25 +11:00
Jeff Parsons
a0a4d77272 Track IText instances per-canvas, not globally. 
Previously instances of the IText shape were added to a globally-shared
array when they were created. There are two problems with this approach:

1) Interactions with one canvas affect others. I would never expect
   text in one canvas to exit edit mode just because I interacted with
   some otherwise-unrelated canvas.

2) Every IText instance leaks. There is no mechanism to clean up references
   to IText instances in the global array, so every such instance will
   hang around in memory forever, regardless of whether it is removed from
   the canvas or if the canvas itself is removed.

Discovered while profiling memory usage in Chrome.
 2015-03-24 14:14:43 +11:00
Juriy Zaytsev
de85900c8f Merge pull request #2050 from asturur/iText-clearing-cache-on-style-change 
Clear cache on setStyle on itext
 2015-03-21 15:39:27 +01:00
Andrea Bogazzi
84bd8bbda0 Update itext.class.js 2015-03-21 12:17:34 +01:00
gordyr
7b6cca5136 Fixed whitespace for Travis build 2015-03-11 23:55:18 +00:00
gordyr
657945f9fd Fixes Mouse hit detection on active groups 
Skips the checking of grouped objects within _searchPossibleTargets since we already check the group as a whole target itself.  Failing to do so would lead to grouped objects being picked up as targets outside of the group since their coordinates change temporarily while grouped.
 2015-03-11 23:29:45 +00:00
Andrea Bogazzi
bc5343adb7 Update resize_filter.class.js 
Add better to toObject support
 2015-03-09 03:19:56 +01:00
Juriy Zaytsev
63180f24a9 Merge pull request #2024 from asturur/Fix-iText-position-bug-when-style-is-empty 
Textwidth for jusitfied align
 2015-03-08 19:14:06 +01:00
Andrea Bogazzi
51c2cd7e74 Update text.class.js 2015-03-08 12:32:33 +01:00
Juriy Zaytsev
a13cca92d9 Merge pull request #2020 from asturur/Fix-iText-position-bug-when-style-is-empty 
Fix gradient for IText. Closes #2013
 2015-03-07 17:48:47 +01:00
Andrea Bogazzi
9ee71616bf Update itext.class.js 2015-03-07 15:57:04 +01:00
Andrea Bogazzi
0933c6f5c2 Update gradient.class.js 2015-03-07 15:56:24 +01:00
kangax
1dff79c2ad Make fabric.Image#fromUrl callback optional 2015-03-05 14:20:55 +01:00
Juriy Zaytsev
51c8cd8b56 Merge pull request #2007 from asturur/itext-selection-on-canvas 
Itext selection on canvas
 2015-03-02 13:56:34 +01:00
Andrea Bogazzi
0e384be263 Update itext_behavior.mixin.js 2015-03-02 13:54:08 +01:00
Andrea Bogazzi
57329b39be Update itext_behavior.mixin.js 2015-03-02 13:48:55 +01:00
Andrea Bogazzi
dda96f9b81 Allow user to select text moving mouse outside itext bounding box 2015-03-02 00:43:25 +01:00
Juriy Zaytsev
2877af6310 Merge pull request #2006 from asturur/fix-pathgroup-toSvg 
Fix path group toSvg method.
 2015-03-01 23:37:17 +01:00
Andrea Bogazzi
08a1c6b418 Fix path group toSvg method. 
now respect current originX and originY
 2015-03-01 23:27:17 +01:00
Juriy Zaytsev
16d636e1de Merge pull request #2005 from asturur/Fix-iText-position-bug-when-style-is-empty 
Fix misplacement of some iText
 2015-03-01 19:27:28 +01:00
Andrea Bogazzi
b89bc01847 Fix misplacement of some iText 2015-03-01 19:05:50 +01:00
Andrea Bogazzi
5fc82e34e2 Fix cache canghe bug. 
Create a copy of the cache instead of modify it.
 2015-03-01 18:58:04 +01:00
Andrea Bogazzi
4ad253ffba Merge pull request #1998 from kangax/revert-1961-fix-EnterEdit 
Revert "Add forcedfocus on enterEditing"
 2015-03-01 18:24:35 +01:00
sapics
ca10ee0d28 support check for setLineDash 2015-02-28 21:42:24 +09:00