Skip to content

Commit e400a45

Browse files
lhywelllhywell
committed
v1.0.47
1 parent 718267d commit e400a45

4 files changed

Lines changed: 17 additions & 6 deletions

File tree

‎dist/inmark.js‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8951,7 +8951,7 @@ var BImage = function (_Init) {
89518951
this._option.widthImg = box.width * this.group.scale[0];
89528952
this._option.heightImg = box.height * this.group.scale[0];
89538953

8954-
this._option.origin = [this._option.widthImg / 2, this._option.heightImg / 2];
8954+
this._option.origin = [this.ctx.canvasWidth / 2, this.ctx.canvasHeight / 2];
89558955
}
89568956
return this._option.origin;
89578957
}
@@ -8998,6 +8998,15 @@ var BImage = function (_Init) {
89988998
position: this._reSetPosition(),
89998999
origin: this.getOrigin()
90009000
});
9001+
9002+
if (this._option.rotateMouse) {
9003+
this._option.rotateMouse.attr({
9004+
rotation: zero,
9005+
position: this._reSetPosition(),
9006+
origin: this.getOrigin()
9007+
});
9008+
}
9009+
90019010
this._option.rotate = {
90029011
radians: 0,
90039012
degrees: 0
@@ -9054,8 +9063,8 @@ var BImage = function (_Init) {
90549063
});
90559064

90569065
this._option.rotate = {
9057-
radians: this.group.rotation,
9058-
degrees: this.group.rotation / Math.PI * 180
9066+
radians: this.group.rotation === zero ? 0 : this.group.rotation,
9067+
degrees: (this.group.rotation === zero ? 0 : this.group.rotation) / Math.PI * 180
90599068
};
90609069

90619070
this._onRotate && this._onRotate(this.getRotate());
@@ -18885,7 +18894,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
1888518894

1888618895
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
1888718896

18888-
var version = "1.0.46";
18897+
var version = "1.0.47";
1888918898
console.log('inMark v' + version);
1889018899
var inMark = {
1889118900
version: version,

‎dist/inmark.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/inmark-js.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@
131131
<link rel="stylesheet" href="./lib/styles/icons.css">
132132
<!-- 引入bootstrap 样式 -->
133133
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.0/dist/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
134+
<!-- 引入样式 -->
135+
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
134136
</head>
135137

136138
<body>

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "inmark",
3-
"version": "1.0.46",
3+
"version": "1.0.47",
44
"description": "Image mark",
55
"main": "dist/inmark.min.js",
66
"scripts": {

0 commit comments

Comments
 (0)