Commit graph

2871 commits

Author SHA1 Message Date
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
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
502259a946 Fix bug with image.class.js not properly calling _initConfig when initializing. 2015-05-27 13:47:06 -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
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