[DE] Bug 40202

apps/documenteditor/main/app/view/CellsRemoveDialog.js

@@ -0,0 +1,131 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  CellsRemoveDialog.js
+ *
+ *  Created by Julia Radzhabova on 05.09.2019
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/MetricSpinner'
+], function () { 'use strict';
+
+    DE.Views.CellsRemoveDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            width: 214,
+            header: true,
+            style: 'min-width: 214px;',
+            cls: 'modal-dlg'
+        },
+
+        initialize : function(options) {
+            _.extend(this.options, {
+                title: this.textTitle
+            }, options || {});
+
+            this.template = [
+                '<div class="box">',
+                    '<div id="table-radio-cells-left" style="padding-bottom: 8px;"></div>',
+                    '<div id="table-radio-cells-row" style="padding-bottom: 8px;"></div>',
+                    '<div id="table-radio-cells-col" style="padding-bottom: 8px;"></div>',
+                '<div class="footer center">',
+                    '<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;">' + this.okButtonText + '</button>',
+                    '<button class="btn normal dlg-btn" result="cancel">' + this.cancelButtonText + '</button>',
+                '</div>'
+            ].join('');
+
+            this.options.tpl = _.template(this.template)(this.options);
+
+            Common.UI.Window.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+
+            this.radioLeft = new Common.UI.RadioBox({
+                el: $('#table-radio-cells-left'),
+                labelText: this.textLeft,
+                name: 'asc-radio-table-cells-rem',
+                checked: true
+            });
+
+            this.radioRow = new Common.UI.RadioBox({
+                el: $('#table-radio-cells-row'),
+                labelText: this.textRow,
+                name: 'asc-radio-table-cells-rem'
+            });
+
+            this.radioCol = new Common.UI.RadioBox({
+                el: $('#table-radio-cells-col'),
+                labelText: this.textCol,
+                name: 'asc-radio-table-cells-rem'
+            });
+
+            var $window = this.getChild();
+            $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                this.options.handler.call(this, state, this.getSettings());
+            }
+
+            this.close();
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        getSettings: function() {
+            return this.radioRow.getValue() ? 'row' : (this.radioCol.getValue() ? 'col' : 'left') ;
+        },
+
+        onPrimary: function() {
+            this._handleInput('ok');
+            return false;
+        },
+
+        cancelButtonText: 'Cancel',
+        okButtonText:   'Ok',
+        textTitle: 'Delete Cells',
+        textLeft: 'Shift cells left',
+        textRow: 'Delete entire row',
+        textCol: 'Delete entire column'
+
+    }, DE.Views.CellsRemoveDialog || {}))
+});

apps/documenteditor/main/app/view/DocumentHolder.js

@@ -54,7 +54,8 @@ define([
     'documenteditor/main/app/view/ParagraphSettingsAdvanced',
     'documenteditor/main/app/view/TableSettingsAdvanced',
     'documenteditor/main/app/view/ControlSettingsDialog',
-    'documenteditor/main/app/view/NumberingValueDialog'
+    'documenteditor/main/app/view/NumberingValueDialog',
+    'documenteditor/main/app/view/CellsRemoveDialog'
 ], function ($, _, Backbone, gateway) { 'use strict';
 
     DE.Views.DocumentHolder =  Backbone.View.extend(_.extend({
@@ -1929,6 +1930,24 @@ define([
             this.fireEvent('editcomplete', this);
         },
 
+        onCellsRemove: function() {
+            var me = this;
+            (new DE.Views.CellsRemoveDialog({
+                handler: function (result, value) {
+                    if (result == 'ok') {
+                        if (value == 'row')
+                            me.api.remRow();
+                        else if (value == 'col')
+                            me.api.remColumn();
+                        else
+                            me.api.asc_RemoveTableCells();
+                    }
+                    me.fireEvent('editcomplete', me);
+                }
+            })).show();
+            this.fireEvent('editcomplete', this);
+        },
+
         createDelayedElementsViewer: function() {
             var me = this;
 
@@ -3165,6 +3184,11 @@ define([
                                 }).on('click', function(item) {
                                     if (me.api)
                                         me.api.remTable();
+                                }),
+                                new Common.UI.MenuItem({
+                                    caption: me.textCells
+                                }).on('click', function(item) {
+                                    me.onCellsRemove();
                                 })
                             ]
                         })
@@ -4110,7 +4134,8 @@ define([
         textCropFit: 'Fit',
         textFollow: 'Follow move',
         toDictionaryText: 'Add to Dictionary',
-        txtPrintSelection: 'Print Selection'
+        txtPrintSelection: 'Print Selection',
+        textCells: 'Cells'
 
     }, DE.Views.DocumentHolder || {}));
 });

apps/documenteditor/main/locale/en.json

@@ -1022,6 +1022,12 @@
   "DE.Views.BookmarksDialog.textSort": "Sort by",
   "DE.Views.BookmarksDialog.textTitle": "Bookmarks",
   "DE.Views.BookmarksDialog.txtInvalidName": "Bookmark name can only contain letters, digits and underscores, and should begin with the letter",
+  "DE.Views.CellsRemoveDialog.cancelButtonText": "Cancel",
+  "DE.Views.CellsRemoveDialog.okButtonText": "Ok",
+  "DE.Views.CellsRemoveDialog.textTitle": "Delete Cells",
+  "DE.Views.CellsRemoveDialog.textLeft": "Shift cells left",
+  "DE.Views.CellsRemoveDialog.textRow": "Delete entire row",
+  "DE.Views.CellsRemoveDialog.textCol": "Delete entire column",
   "DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
   "DE.Views.ChartSettings.textArea": "Area",
   "DE.Views.ChartSettings.textBar": "Bar",
@@ -1279,6 +1285,7 @@
   "DE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
   "DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
+  "DE.Views.DocumentHolder.textCells": "Cells",
   "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancel",
   "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",