diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template index 23880858e..26f132647 100644 --- a/apps/documenteditor/main/app/template/ControlSettingsDialog.template +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -7,6 +7,12 @@ <div id="control-settings-txt-name"></div> </td> </tr> + <tr> + <td class="padding-small"> + <label class="input-label"><%= scope.textPlaceholder %></label> + <div id="control-settings-txt-pholder"></div> + </td> + </tr> <tr> <td class="padding-large"> <label class="input-label"><%= scope.textTag %></label> diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 9dfdf88b5..295763422 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -104,6 +104,15 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', value : '' }); + this.txtPlaceholder = new Common.UI.InputField({ + el : $('#control-settings-txt-pholder'), + allowBlank : true, + validateOnChange: false, + validateOnBlur: false, + style : 'width: 100%;', + value : '' + }); + this.cmbShow = new Common.UI.ComboBox({ el: $('#control-settings-combo-show'), cls: 'input-group-nr', @@ -300,6 +309,9 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', val = props.get_Tag(); this.txtTag.setValue(val ? val : ''); + val = props.get_PlaceholderText(); + this.txtPlaceholder.setValue(val ? val : ''); + val = props.get_Appearance(); (val!==null && val!==undefined) && this.cmbShow.setValue(val); @@ -390,6 +402,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', var props = new AscCommon.CContentControlPr(); props.put_Alias(this.txtName.getValue()); props.put_Tag(this.txtTag.getValue()); + props.put_PlaceholderText(this.txtPlaceholder.getValue()); props.put_Appearance(this.cmbShow.getValue()); if (this.isSystemColor) { @@ -641,7 +654,8 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', textCheckbox: 'Check box', textChecked: 'Checked symbol', textUnchecked: 'Unchecked symbol', - tipChange: 'Change symbol' + tipChange: 'Change symbol', + textPlaceholder: 'Placeholder' }, DE.Views.ControlSettingsDialog || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 8424d3d9c..a2d880c91 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1169,6 +1169,7 @@ "DE.Views.ControlSettingsDialog.tipChange": "Change symbol", "DE.Views.ControlSettingsDialog.txtLockDelete": "Content control cannot be deleted", "DE.Views.ControlSettingsDialog.txtLockEdit": "Contents cannot be edited", + "DE.Views.ControlSettingsDialog.textPlaceholder": "Placeholder", "DE.Views.CustomColumnsDialog.textColumns": "Number of columns", "DE.Views.CustomColumnsDialog.textSeparator": "Column divider", "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",