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

add deprecated property in EditBox in v2.0 #3912

Merged
merged 1 commit into from
Feb 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions cocos2d/core/components/editbox/CCEditBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,11 @@ let EditBox = cc.Class({
},

/**
* !#en The input is always visible and be on top of the game view (only useful on Web).
* !zh 输入框总是可见,并且永远在游戏视图的上面(这个属性只有在 Web 上面修改有意义)
* !#en The input is always visible and be on top of the game view (only useful on Web), this property will be removed on v2.1
* !zh 输入框总是可见,并且永远在游戏视图的上面(这个属性只有在 Web 上面修改有意义),该属性会在 v2.1 中移除
* Note: only available on Web at the moment.
* @property {Boolean} stayOnTop
* @deprecated since 2.0.8
*/
stayOnTop: {
tooltip: CC_DEV && 'i18n:COMPONENT.editbox.stay_on_top',
Expand Down Expand Up @@ -639,9 +640,10 @@ let EditBox = cc.Class({
},

/**
* !#en Let the EditBox get focus
* !#zh 让当前 EditBox 获得焦点
* !#en Let the EditBox get focus, this method will be removed on v2.1
* !#zh 让当前 EditBox 获得焦点, 这个方法会在 v2.1 中移除
* @method setFocus
* @deprecated since 2.0.8
*/
setFocus () {
if(this._impl) {
Expand Down
2 changes: 1 addition & 1 deletion editor/i18n/en/localization.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ module.exports = {
"input_mode": "Specify the input mode: multiline or single line.",
"font_size": "The font size of input label.",
"line_height": "The line height of input label.",
"stay_on_top": "Set to true and the input is always visible and be on top of the game view",
"stay_on_top": "Set to true and the input is always visible and be on top of the game view, this property will be removed on v2.1",
"tab_index": "Set the tabIndex of the DOM input element, only useful on Web.",
"font_color": "The font color of input label.",
"placeholder": "The content string of placeholder.",
Expand Down
2 changes: 1 addition & 1 deletion editor/i18n/zh/localization.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ module.exports = {
"font_size": "输入框文本的字体大小",
"line_height": "输入框文本的行高",
"font_color": "输入框文本的颜色",
"stay_on_top": "设置为 True 则输入框总是可见,并且永远在游戏视图的上面",
"stay_on_top": "设置为 True 则输入框总是可见,并且永远在游戏视图的上面,该属性会在 v2.1 中移除",
"tab_index": "修改 DOM 输入元素的 tabIndex,这个属性只有在 Web 上面修改有意义。",
"placeholder": "输入框占位符的文本内容",
"placeholder_font_size": "输入框占位符的字体大小",
Expand Down