Skip to content
This repository has been archived by the owner on Aug 1, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
  • Loading branch information
Fengyuan Chen committed Jun 8, 2015
2 parents 678983f + b1b5ea6 commit 6645c3f
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ $('.container > img').cropper({

- The size of the cropper inherits from the size of the image's parent element (wrapper), so be sure to wrap the image with a visible block element.

- The outputed cropped data bases on the original image size, so you can use them to crop the image directly.
- The outputted cropped data bases on the original image size, so you can use them to crop the image directly.

- If you try to start cropper on a cross-origin image, please make sure that your browser supports HTML5 [CORS settings attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes), and your image server supports the `Access-Control-Allow-Origin` option.

Expand Down Expand Up @@ -196,7 +196,7 @@ Show the dashed lines above the crop box.
- Type: `Boolean`
- Default: `true`

Show the withe modal above the crop box (highlight the crop box).
Show the white modal above the crop box (highlight the crop box).


### autoCrop
Expand Down Expand Up @@ -624,7 +624,7 @@ Change the crop box position and size.

- **options** (optional):
- Type: `Object`
- properties
- Properties:
- `width`: the destination width of the output canvas
- `height`: the destination height of the output canvas
- `fillColor`: a color to fill any alpha values in the output canvas
Expand Down Expand Up @@ -705,14 +705,15 @@ This event fires when the crop box starts to change.

> Related original events: "mousedown", "touchstart".
```
```js
$().on('dragstart.cropper', function (e) {
console.log(e.type); // dragstart
console.log(e.namespace); // cropper
console.log(e.dragType); // ...
});
```


### dragmove.cropper

- **event.dragType**: The same as "dragstart.cropper".
Expand Down Expand Up @@ -761,7 +762,7 @@ If you have to use other plugin with the same namespace, just call the `$.fn.cro



## Browser Support
## Browser support

- Chrome 38+
- Firefox 33+
Expand Down

0 comments on commit 6645c3f

Please sign in to comment.