Commit graph

2854 commits

Author SHA1 Message Date
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
Andrea Bogazzi
a4cb8879fc Update object_interactivity.mixin.js 2015-05-18 21:44:12 +02:00
kangax
316861cd57 Fix pattern test 2015-05-18 12:11:56 -04: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
kangax
a09d2d3d06 Build dist 2015-05-18 11:15:09 -04:00
Juriy Zaytsev
70914888f7 Merge pull request #2203 from flyerco/hotfix/stroke-dash-array
Set default value of strokeDashArray so that SVG is valid
2015-05-18 09:42:49 -04:00
Andrea Bogazzi
cfd7521482 Update text.class.js 2015-05-18 08:16:04 +02:00
Ulrich Sossou
4603ec9581 Replace empty values of stroke-dasharray in unit tests by 'none' 2015-05-18 07:00:36 +01: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
Juriy Zaytsev
07445ded08 Merge pull request #2193 from milan-w/fix/duplicate-line-styles
Resubmit: Fix duplication of line styles when inserting a newline in IText
2015-05-13 11:46:23 -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
5259cdbb2e add unit test for IText functions insertNewlineStyleObject and shiftLineStyles 2015-05-12 11:57:41 +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
Juriy Zaytsev
d3c446d792 Merge pull request #2182 from asturur/fix-restore-stroke-gradient-from-object
Fix restore stroke gradient from object
2015-05-10 12:29:31 -04: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
Andrea Bogazzi
b214818cad Merge pull request #10 from kangax/master
update to master
2015-05-09 09:38:12 +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
Juriy Zaytsev
3bcde59ea3 Merge pull request #2171 from asturur/fixTminGroup
Fix transform Matrix in group
2015-05-05 13:11:05 +02:00
Andrea Bogazzi
02dca44656 Update group.class.js 2015-05-05 12:54:53 +02:00
Andrea Bogazzi
afcf7c1285 Update group.js 2015-05-05 12:53:55 +02:00
Andrea Bogazzi
5411085b61 Merge pull request #9 from kangax/master
Update to master
2015-05-05 12:51:39 +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
Juriy Zaytsev
5d6cd9b82f Merge pull request #2155 from asturur/fixingstrokewidth
Remove old strokeWidth calculation
2015-05-03 16:46:39 +02:00
Juriy Zaytsev
ae81dbcd0f Merge pull request #2166 from SmartestEdu/remove-build.js-from-npm-ignore
Remove build.js from .npmignore.
2015-05-03 16:41:17 +02:00
Matt Farmer
7013282f53 Remove build.js from .npmignore. 2015-05-02 10:28:44 -07:00
Andrea Bogazzi
80c3012646 Update object_origin.mixin.js 2015-05-02 19:13:44 +02:00