Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[PE] Fix applying hyperlink settings

Browse source
This commit is contained in:
Julia Radzhabova 2020-03-06 16:14:08 +03:00
parent b1269c3677
commit 77ab8c41bc
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -234,7 +234,7 @@ define([
var type = me.parseUrl(props.get_Value()); var type = me.parseUrl(props.get_Value());
(type == c_oHyperlinkType.WebLink) ? me.btnExternal.toggle(true) : me.btnInternal.toggle(true); (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) { if (props.get_Text()!==null) {
me.inputDisplay.setValue(props.get_Text()); me.inputDisplay.setValue(props.get_Text());
@ -322,28 +322,13 @@ define([
this.close(); this.close();
}, },
ShowHideElem: function(value) { ShowHideElem: function(value, url) {
this.externalPanel.toggleClass('hidden', value !== c_oHyperlinkType.WebLink); this.externalPanel.toggleClass('hidden', value !== c_oHyperlinkType.WebLink);
this.internalPanel.toggleClass('hidden', value !== c_oHyperlinkType.InternalLink); this.internalPanel.toggleClass('hidden', value !== c_oHyperlinkType.InternalLink);
if (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=='' ) if (url===null || url===undefined || url=='' )
return c_oHyperlinkType.WebLink; url = "ppaction://hlinkshowjump?jump=firstslide";
var store = this.internalList.store; var store = this.internalList.store;
var indAction = url.indexOf("ppaction://hlink");
if (0 == indAction)
{
if (store.length<1) { if (store.length<1) {
var arr = [], i = 0; var arr = [], i = 0;
arr.push(new Common.UI.TreeViewModel({ arr.push(new Common.UI.TreeViewModel({
@ -420,7 +405,25 @@ define([
selected: i==slideNum 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; return c_oHyperlinkType.InternalLink;
} else { } else {
this.inputUrl.setValue(url ? url.replace(new RegExp(" ",'g'), "%20") : ''); this.inputUrl.setValue(url ? url.replace(new RegExp(" ",'g'), "%20") : '');

1
apps/presentationeditor/main/resources/less/app.less
View file

@ -88,6 +88,7 @@
@import "../../../../common/main/resources/less/radiobox.less"; @import "../../../../common/main/resources/less/radiobox.less";
@import "../../../../common/main/resources/less/dataview.less"; @import "../../../../common/main/resources/less/dataview.less";
@import "../../../../common/main/resources/less/listview.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/colorpalette.less";
@import "../../../../common/main/resources/less/theme-colorpalette.less"; @import "../../../../common/main/resources/less/theme-colorpalette.less";
@import "../../../../common/main/resources/less/dimension-picker.less"; @import "../../../../common/main/resources/less/dimension-picker.less";