From b8439d88fd26e31780d7a86e5f128f4beb71c785 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Wed, 4 Mar 2020 14:45:42 +0300
Subject: [PATCH] [DE][SSE] Change hyperlink settings: disable Ok button when
 no url or data range

---
 .../main/app/view/HyperlinkSettingsDialog.js   | 15 +++++++++++----
 .../main/app/view/HyperlinkSettingsDialog.js   | 18 +++++++++++++-----
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
index 0d7f8c0c2..680f99917 100644
--- a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
@@ -67,19 +67,22 @@ define([
             }, options || {});
 
             this.template = [
-                '<div class="box" style="height: 260px;">',
+                '<div class="box" style="height: 263px;">',
                     '<div class="input-row" style="margin-bottom: 10px;">',
                         '<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-external" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textExternal,'</button>',
                         '<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-internal" style="border-top-left-radius: 0;border-bottom-left-radius: 0;">', this.textInternal,'</button>',
                     '</div>',
                     '<div id="id-external-link">',
                         '<div class="input-row">',
-                            '<label>' + this.textUrl + ' *</label>',
+                            '<label>' + this.textUrl + '</label>',
                         '</div>',
                         '<div id="id-dlg-hyperlink-url" class="input-row" style="margin-bottom: 5px;"></div>',
                     '</div>',
                     '<div id="id-internal-link">',
-                        '<div id="id-dlg-hyperlink-list" style="width:100%; height: 130px;border: 1px solid #cfcfcf;"></div>',
+                        '<div class="input-row">',
+                            '<label>' + this.textUrl + '</label>',
+                        '</div>',
+                        '<div id="id-dlg-hyperlink-list" style="width:100%; height: 115px;border: 1px solid #cfcfcf;"></div>',
                     '</div>',
                     '<div class="input-row">',
                         '<label>' + this.textDisplay + '</label>',
@@ -134,6 +137,9 @@ define([
                     return (urltype>0) ? true : me.txtNotUrl;
                 }
             });
+            me.inputUrl._input.on('input', function (e) {
+                me.btnOk.setDisabled($.trim($(e.target).val())=='');
+            });
 
             me.inputDisplay = new Common.UI.InputField({
                 el          : $('#id-dlg-hyperlink-display'),
@@ -247,12 +253,13 @@ define([
                         }
                     }
                     store.reset(arr);
+                    this.internalList.collapseAll();
                 }
                 var rec = this.internalList.getSelectedRec();
                 this.btnOk.setDisabled(!rec || rec.get('level')==0 && rec.get('index')>0);
 
             } else
-                this.btnOk.setDisabled(false);
+                this.btnOk.setDisabled($.trim(this.inputUrl.getValue())=='');
         },
 
         onLinkTypeClick: function(type, btn, event) {
diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
index ff1ad9e0a..3dc4764a5 100644
--- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
@@ -71,13 +71,13 @@ define([
                     '</div>',
                     '<div id="id-external-link">',
                         '<div class="input-row">',
-                            '<label>' + this.strLinkTo + ' *</label>',
+                            '<label>' + this.strLinkTo + '</label>',
                         '</div>',
                         '<div id="id-dlg-hyperlink-url" class="input-row" style="margin-bottom: 5px;"></div>',
                     '</div>',
                     '<div id="id-internal-link" class="hidden">',
                         '<div class="input-row">',
-                            '<label>' + this.strRange + ' *</label>',
+                            '<label>' + this.strRange + '</label>',
                         '</div>',
                         '<div id="id-dlg-hyperlink-range" class="input-row" style="margin-bottom: 5px;"></div>',
                         '<div id="id-dlg-hyperlink-list" style="width:100%; height: 115px;border: 1px solid #cfcfcf;"></div>',
@@ -134,6 +134,9 @@ define([
                     return (urltype>0) ? true : me.txtNotUrl;
                 }
             });
+            me.inputUrl._input.on('input', function (e) {
+                me.btnOk.setDisabled($.trim($(e.target).val())=='');
+            });
 
             me.inputRange = new Common.UI.InputField({
                 el          : $('#id-dlg-hyperlink-range'),
@@ -152,6 +155,9 @@ define([
                     }
                 }
             });
+            me.inputRange._input.on('input', function (e) {
+                me.btnOk.setDisabled($.trim($(e.target).val())=='');
+            });
 
             me.inputDisplay = new Common.UI.InputField({
                 el          : $('#id-dlg-hyperlink-display'),
@@ -328,6 +334,7 @@ define([
                         hasParent: false,
                         isEmptyItem: false,
                         isNotHeader: false,
+                        isExpanded: false,
                         hasSubItems: false
                     }));
                     var ranges = this.settings.ranges,
@@ -343,6 +350,7 @@ define([
                                 level: 1,
                                 index: arr.length,
                                 type: 1, // defined name
+                                isVisible: false,
                                 hasParent: true
                             }));
                             prev_level = 1;
@@ -352,10 +360,10 @@ define([
                 }
                 var rec = this.internalList.store.findWhere({name: this.settings.currentSheet });
                 rec && this.internalList.scrollToRecord(this.internalList.selectRecord(rec));
-                this.btnOk.setDisabled(!rec || rec.get('level')==0);
+                this.btnOk.setDisabled(!rec || rec.get('level')==0 || rec.get('type')==0 && $.trim(this.inputRange.getValue())=='');
 
             } else
-                this.btnOk.setDisabled(false);
+                this.btnOk.setDisabled($.trim(this.inputUrl.getValue())=='');
         },
 
         onLinkTypeClick: function(type, btn, event) {
@@ -363,7 +371,7 @@ define([
         },
 
         onSelectItem: function(picker, item, record, e){
-            this.btnOk.setDisabled(record.get('level')==0);
+            this.btnOk.setDisabled(record.get('level')==0 || record.get('type')==0 && $.trim(this.inputRange.getValue())=='');
             this.inputRange.setDisabled(record.get('type')==1 || record.get('level')==0);
         },