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
|
b036092ff0
|
Merge remote-tracking branch 'origin/textbox' into textbox
|
2015-05-27 20:17:50 -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
|
84adfa180b
|
revert filemode changes
|
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 |
|
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
|
bb32d78db1
|
adhere to 120 character limit
|
2015-05-27 14:18:52 -07:00 |
|
inssein
|
1067ac028a
|
forgot to set proper style guide when auto-formatting
|
2015-05-27 13:59:56 -07:00 |
|
inssein
|
502259a946
|
Fix bug with image.class.js not properly calling _initConfig when initializing.
|
2015-05-27 13:47:06 -07:00 |
|
inssein
|
8c7ce62b81
|
revert filemode changes
|
2015-05-27 13:30:35 -07:00 |
|
inssein
|
49a893d06f
|
typo..
|
2015-05-27 11:47:45 -07:00 |
|
inssein
|
1062fdb26e
|
missed main textbox class, and autoformatted changes.
|
2015-05-27 11:47:13 -07:00 |
|
inssein
|
a1e578b137
|
Textbox implementaion from Jaffer Haider, with one minor change in textbox_key_behavior
|
2015-05-27 11:44:53 -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 |
|