Skip to content

Commit

Permalink
Merge pull request #492 from entrylabs/issue/4901
Browse files Browse the repository at this point in the history
pattern bug fix
  • Loading branch information
chanlee authored Oct 17, 2016
2 parents 6abc8ac + e0d9fc2 commit 65a05bb
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 27 deletions.
7 changes: 3 additions & 4 deletions dist/entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -20865,12 +20865,11 @@ Entry.BlockView.pngMap = {};
this.pathGroup = this.svgGroup.elem("g");
this._updateMagnet();
this._path = this.pathGroup.elem("path");
$(this._path).mouseenter(function(a) {
Entry.isMobile() || ($(this._path).mouseenter(function(a) {
c._mouseEnable && c._changeFill(!0);
});
$(this._path).mouseleave(function(a) {
}), $(this._path).mouseleave(function(a) {
c._mouseEnable && c._changeFill(!1);
});
}));
var g = this._schema.color;
this.block.deletable === Entry.Block.DELETABLE_FALSE_LIGHTEN && (g = Entry.Utils.colorLighten(g));
this._fillColor = g;
Expand Down
30 changes: 15 additions & 15 deletions dist/entry.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 11 additions & 8 deletions src/workspace/block_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,18 @@ Entry.BlockView.pngMap = {};

this._path = this.pathGroup.elem("path");

$(this._path).mouseenter(function(e) {
if (!that._mouseEnable) return;
that._changeFill(true);
});
//enable mouse pattern only for desktou
if (!Entry.isMobile()) {
$(this._path).mouseenter(function(e) {
if (!that._mouseEnable) return;
that._changeFill(true);
});

$(this._path).mouseleave(function(e) {
if (!that._mouseEnable) return;
that._changeFill(false);
});
$(this._path).mouseleave(function(e) {
if (!that._mouseEnable) return;
that._changeFill(false);
});
}

var fillColor = this._schema.color;
if (this.block.deletable === Entry.Block.DELETABLE_FALSE_LIGHTEN)
Expand Down

0 comments on commit 65a05bb

Please sign in to comment.