From 77ab8c41bcc286e834e3067b58ecc655fa216d0d Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 6 Mar 2020 16:14:08 +0300
Subject: [PATCH] [PE] Fix applying hyperlink settings

---
 .../main/app/view/HyperlinkSettingsDialog.js  | 43 ++++++++++---------
 .../main/resources/less/app.less              |  1 +
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js b/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
index 795ba0a1f9..c2cf38d000 100644
--- a/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
+++ b/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
@@ -234,7 +234,7 @@ define([
 
                 var type = me.parseUrl(props.get_Value());
                 (type == c_oHyperlinkType.WebLink) ? me.btnExternal.toggle(true) : me.btnInternal.toggle(true);
-                me.ShowHideElem(type);
+                me.ShowHideElem(type, props.get_Value());
                 
                 if (props.get_Text()!==null) {
                     me.inputDisplay.setValue(props.get_Text());
@@ -322,28 +322,13 @@ define([
             this.close();
         },
 
-        ShowHideElem: function(value) {
+        ShowHideElem: function(value, url) {
             this.externalPanel.toggleClass('hidden', value !== c_oHyperlinkType.WebLink);
             this.internalPanel.toggleClass('hidden', value !== c_oHyperlinkType.InternalLink);
             if (value==c_oHyperlinkType.InternalLink) {
-                var rec = this.internalList.getSelectedRec();
-                this.btnOk.setDisabled(!rec || rec.get('index')==4);
-            } else
-                this.btnOk.setDisabled($.trim(this.inputUrl.getValue())=='');
-        },
-
-        onLinkTypeClick: function(type, btn, event) {
-            this.ShowHideElem(type);
-        },
-
-        parseUrl: function(url) {
-            if (url===null || url===undefined || url=='' )
-                return c_oHyperlinkType.WebLink;
-
-            var store = this.internalList.store;
-            var indAction = url.indexOf("ppaction://hlink");
-            if (0 == indAction)
-            {
+                if (url===null || url===undefined || url=='' )
+                    url = "ppaction://hlinkshowjump?jump=firstslide";
+                var store = this.internalList.store;
                 if (store.length<1) {
                     var arr = [], i = 0;
                     arr.push(new Common.UI.TreeViewModel({
@@ -420,7 +405,25 @@ define([
                             selected: i==slideNum
                         }));
                     }
+                    store.reset(arr);
                 }
+                var rec = this.internalList.getSelectedRec();
+                this.btnOk.setDisabled(!rec || rec.get('index')==4);
+            } else
+                this.btnOk.setDisabled($.trim(this.inputUrl.getValue())=='');
+        },
+
+        onLinkTypeClick: function(type, btn, event) {
+            this.ShowHideElem(type);
+        },
+
+        parseUrl: function(url) {
+            if (url===null || url===undefined || url=='' )
+                return c_oHyperlinkType.WebLink;
+
+            var indAction = url.indexOf("ppaction://hlink");
+            if (0 == indAction)
+            {
                 return c_oHyperlinkType.InternalLink;
             } else  {
                 this.inputUrl.setValue(url ? url.replace(new RegExp(" ",'g'), "%20") : '');
diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less
index ba083683e2..c62b1ab3bf 100644
--- a/apps/presentationeditor/main/resources/less/app.less
+++ b/apps/presentationeditor/main/resources/less/app.less
@@ -88,6 +88,7 @@
 @import "../../../../common/main/resources/less/radiobox.less";
 @import "../../../../common/main/resources/less/dataview.less";
 @import "../../../../common/main/resources/less/listview.less";
+@import "../../../../common/main/resources/less/treeview.less";
 @import "../../../../common/main/resources/less/colorpalette.less";
 @import "../../../../common/main/resources/less/theme-colorpalette.less";
 @import "../../../../common/main/resources/less/dimension-picker.less";