Commit graph

1754 commits

Author SHA1 Message Date
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
Andrea Bogazzi
23b14df20a Update itext_behavior.mixin.js 2015-02-28 13:10:28 +01:00
KJ Tsanaktsidis
a18acd43f5 YET MORE code style errors... 2015-02-27 15:21:00 +11:00
KJ Tsanaktsidis
cf92898071 Fix code style errors 2015-02-27 15:12:47 +11:00
KJ Tsanaktsidis
f16bf53763 Don't clone objects while serialising selection groups
Clone can be async for some object types, so we can't use it during
the serialisation process. Instead, apply the group transforms directly
on the object being serialised, and then undo it after serialising.
2015-02-27 15:04:26 +11:00
KJ Tsanaktsidis
00e6e71e4d Fixed code style error 2015-02-26 14:03:44 +11:00
KJ Tsanaktsidis
ea8bc67ce8 Don't destroy the selection group when doing toJSON
Instead, simulate what would happen to the children of the selection
group if the group were to be released. This is non-destructive on
the state of the canvas from the API user's perspective.
2015-02-26 13:57:58 +11:00
KJ Tsanaktsidis
492a7693c5 Don't destroy the selection group when doing toSVG
toSVG now mirrors the behaviour of toJSON and does not destroy
the active selection group when serialising. Instead, the effect
of the group is simulated on a clone of the object and this is
what gets serialised.
2015-02-26 13:57:58 +11:00
Andrea Bogazzi
69653b1085 Revert "Add forcedfocus on enterEditing" 2015-02-25 17:57:20 +01:00
Juriy Zaytsev
1e5bd1e678 Merge pull request #1989 from StileEducation/PR_cursor_timer
Fixed race condition in the iText cursor flash animation
2015-02-25 14:21:32 +01:00
Juriy Zaytsev
bf40c717a8 Merge pull request #1988 from StileEducation/PR_stroke_dash_array
Fix base throwing error when strokeDashArray unitialized
2015-02-24 12:46:59 +01:00
Andrea Bogazzi
320c7cac6d Update text.class.js
Fix a bug caused by lazy copy paste , replace.
2015-02-24 10:29:03 +01:00
KJ Tsanaktsidis
b0e2caf88f Fixed style errors from linter 2015-02-24 15:09:45 +11:00
KJ Tsanaktsidis
7ea4e6c1cc Fixed race condition in the iText cursor flas animation
The animation that flashes the iText cursor can race its own
cancellation, meaning that you can have two _tick()'s and two
_tickComplete() animations at the same time. On iOS in particular,
most likely due to the lower frequency of timeouts, this can trap
the cursor in a state where its opacity is always <0.1 and is
essentially invisible.
2015-02-24 14:55:58 +11:00
KJ Tsanaktsidis
ef81b23d85 Fix base throwing error when strokeDashArray unitialized
Other places in the codebase guard the call to ctx.setLineDash,
so this should happen here too.
2015-02-24 14:34:47 +11:00
Juriy Zaytsev
c8df694460 Merge pull request #1960 from asturur/fix-shadow-by-zoom-level
Shadow Size fix
2015-02-12 20:35:33 +01:00
Andrea Bogazzi
55d6f300f6 Update object.class.js 2015-02-12 20:27:20 +01:00
kangax
8a48598c68 Check for presence of filter. Closes #1967 2015-02-11 01:30:13 +01:00
kangax
220256c267 Extract regex out of method 2015-02-07 14:14:32 +01:00