From 5e2ef96d8a30cf609713433bc752ca399d4414a0 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 7 Aug 2017 12:23:03 +0300 Subject: [PATCH] [DE][PE] Change title for split cell dialog. --- apps/common/main/lib/view/InsertTableDialog.js | 8 +++++--- apps/documenteditor/main/app/view/DocumentHolder.js | 1 + apps/documenteditor/main/app/view/TableSettings.js | 1 + apps/documenteditor/main/locale/en.json | 1 + apps/presentationeditor/main/app/view/DocumentHolder.js | 1 + apps/presentationeditor/main/app/view/TableSettings.js | 1 + apps/presentationeditor/main/locale/en.json | 1 + 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/view/InsertTableDialog.js b/apps/common/main/lib/view/InsertTableDialog.js index 22655700a..0189aa7fc 100644 --- a/apps/common/main/lib/view/InsertTableDialog.js +++ b/apps/common/main/lib/view/InsertTableDialog.js @@ -51,7 +51,8 @@ define([ height: 170, header: false, style: 'min-width: 230px;', - cls: 'modal-dlg' + cls: 'modal-dlg', + split: false }, initialize : function(options) { @@ -59,7 +60,7 @@ define([ this.template = [ '
', - '

' + this.txtTitle + '

', + '

' + ((options.split) ? this.txtTitleSplit : this.txtTitle) + '

', '
', '
', '
', @@ -132,7 +133,8 @@ define([ return false; }, - txtTitle: 'Table size', + txtTitle: 'Table Size', + txtTitleSplit: 'Split Cell', txtColumns: 'Number of Columns', txtRows: 'Number of Rows', textInvalidRowsCols: 'You need to specify valid rows and columns count.', diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index b8a01d321..1608246f3 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2308,6 +2308,7 @@ define([ }).on('click', function(item) { if (me.api){ (new Common.Views.InsertTableDialog({ + split: true, handler: function(result, value) { if (result == 'ok') { if (me.api) { diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index 9e0012375..cf0ecc039 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -237,6 +237,7 @@ define([ splitCells: function(menu, item, e) { var me = this; (new Common.Views.InsertTableDialog({ + split: true, handler: function(result, value) { if (result == 'ok') { if (me.api) { diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 3d1feb290..9ccfc2422 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -172,6 +172,7 @@ "Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.", "Common.Views.InsertTableDialog.txtRows": "Number of Rows", "Common.Views.InsertTableDialog.txtTitle": "Table Size", + "Common.Views.InsertTableDialog.txtTitleSplit": "Split Cell", "Common.Views.LanguageDialog.btnCancel": "Cancel", "Common.Views.LanguageDialog.btnOk": "Ok", "Common.Views.LanguageDialog.labelSelect": "Select document language", diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 975dff275..afd4eca2e 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1915,6 +1915,7 @@ define([ }).on('click', function(item) { if (me.api) { (new Common.Views.InsertTableDialog({ + split: true, handler: function(result, value) { if (result == 'ok') { if (me.api) { diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js index a03dc46be..bf751e82a 100644 --- a/apps/presentationeditor/main/app/view/TableSettings.js +++ b/apps/presentationeditor/main/app/view/TableSettings.js @@ -203,6 +203,7 @@ define([ splitCells: function(menu, item, e) { var me = this; (new Common.Views.InsertTableDialog({ + split: true, handler: function(result, value) { if (result == 'ok') { if (me.api) { diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index fd7ee4604..8448dd1e1 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -105,6 +105,7 @@ "Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.", "Common.Views.InsertTableDialog.txtRows": "Number of Rows", "Common.Views.InsertTableDialog.txtTitle": "Table Size", + "Common.Views.InsertTableDialog.txtTitleSplit": "Split Cell", "Common.Views.LanguageDialog.btnCancel": "Cancel", "Common.Views.LanguageDialog.btnOk": "Ok", "Common.Views.LanguageDialog.labelSelect": "Select document language",