Skip to content

Commit

Permalink
Merge pull request fabricjs#22 from tbolis/develop
Browse files Browse the repository at this point in the history
**0.4.0** New Features and fixes
    - Fixes
    -- Upgraded to latest packages (thanks @fjogeleit)
    -- Fix for undo/redo (thanks @pomelyu)
    -- Issue fabricjs#9 fixed
    -- Issue fabricjs#10 and fabricjs#15 you can no longer give dataUrl as value only as background image and/or by adding the image as an object
    - Breaking Changes
    -- `data` and `dataType` properties have been replaced with `value` and `defaultValue`
    to be able to use the component as controlled component
    -- node support of 6,7 and 8
    - New Features
    -- ability to add an image as object
  • Loading branch information
tbolis committed Nov 17, 2017
2 parents 5630ecd + 247ca2f commit 6c89bfa
Show file tree
Hide file tree
Showing 12 changed files with 8,012 additions and 400 deletions.
29 changes: 6 additions & 23 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,31 +1,14 @@
{
"presets": [
"es2015",
[
"env",
{
"modules": false
}
],
"react",
"stage-0"
],
"env": {
"development": {
"plugins": [
[
"react-transform",
{
"transforms": [
{
"transform": "react-transform-hmr",
"imports": [
"react"
],
"locals": [
"module"
]
}
]
}
]
]
}
},
"plugins": [
"react-hot-loader/babel",
"transform-object-assign",
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
language: node_js
node_js:
- "8"
- "7"
- "6"
- "5"
env:
- CXX=g++-4.8
addons:
Expand All @@ -12,5 +13,5 @@ addons:
- g++-4.8
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq libgif-dev libpng-dev libjpeg8-dev libpango1.0-dev libcairo2-dev
- sudo apt-get install -y -qq libgif-dev libpng-dev libjpeg8-dev libpango1.0-dev libcairo2-dev
script: 'npm run build && npm run test'
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
## Changelog

* **0.4.0** New Features and fixes
- Fixes
-- Upgraded to latest packages (thanks @fjogeleit)
-- Fix for undo/redo (thanks @pomelyu)
-- Issue #9 fixed
-- Issue #10 and #15 you can no longer give dataUrl as value only as background image and/or by adding the image as an object
- Breaking Changes
-- `data` and `dataType` properties have been replaced with `value` and `defaultValue`
to be able to use the component as controlled component
-- node support of 6,7 and 8
- New Features
-- ability to add an image as object
* **0.3.0** New Features and fixes
- HOT Deploy fixed
- Added selection of background Color
Expand Down
9 changes: 1 addition & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,7 @@ npm install react-sketch --save

In order to build from source, read the [relevant instructions](http://fabricjs.com/fabric-intro-part-4#node) first.

On an ubuntu machine perform the following steps to install, node version should be >=4 , tested with versions 4,5,6 (see travis-ci).
This is only for installation (npm install) we can then change back to a newer stable node version

```sh
$ sudo apt-get install libcairo2-dev libjpeg-dev libgif-dev
$ sudo npm install -g canvas
$ npm install
```
Tested with node versions 4,5,6,7,8.

## Usage

Expand Down
Loading

0 comments on commit 6c89bfa

Please sign in to comment.