Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug fix on editBox #5088

Merged
merged 3 commits into from Aug 7, 2019

Conversation

@umbrellaPP
Copy link
Contributor

commented Aug 5, 2019

Re: cocos-creator/2d-tasks#1635

changeLog:

  • 修复原生平台给 EditBox.string 传 number 类型导致的报错问题
  • Edge 浏览器上隐藏 Clear 按钮,因为清除输入内容不会触发 input 事件
  • 同步 Label 节点的 scale 到 input.fontSize

1
2

@2youyou2 2youyou2 merged commit ea2a805 into cocos-creator:v2.1.3 Aug 7, 2019
1 check passed
1 check passed
ci/circleci: test Your tests passed on CircleCI!
Details
Marssssssss added a commit to Marssssssss/engine that referenced this pull request Aug 7, 2019
* convert to string for EditBox.string property

* hide clear button of input on Edge Browser

* sync label node scale to dom input fontSize
@umbrellaPP umbrellaPP deleted the umbrellaPP:2.1.3_editbox branch Aug 7, 2019
if (cc.sys.browserType === cc.sys.BROWSER_TYPE_EDGE) {
styleEl.innerHTML += `#${this._domId}::-ms-clear{
display: none;
}`;

This comment has been minimized.

Copy link
@jareguo

jareguo Aug 20, 2019

Contributor

这段代码带了回车和空格(为了排版),这些空格引擎压缩后是去不掉的,建议修改一下,不要用模板字符串

This comment has been minimized.

Copy link
@umbrellaPP

umbrellaPP Aug 20, 2019

Author Contributor
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.