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

Revert "[DE] Hide creating bookmarks and internal hyperlinks (rev. b402ac5b89)"

Browse source 
This reverts commit 2753925184.
This commit is contained in:
Julia Radzhabova 2018-04-17 15:47:41 +03:00
parent 469c841dab
commit 960bef0a30
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/template/Toolbar.template
View file

@ -161,7 +161,7 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<span class="btn-slot text x-huge slot-inshyperlink"></span> <span class="btn-slot text x-huge slot-inshyperlink"></span>
<!--<span class="btn-slot text x-huge" id="slot-btn-bookmarks"></span>--> <span class="btn-slot text x-huge" id="slot-btn-bookmarks"></span>
</div> </div>
</section> </section>
</section> </section>

11
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -66,8 +66,8 @@ define([
}, options || {}); }, options || {});
this.template = [ this.template = [
'<div class="box" style="height: 150px;">', '<div class="box" style="height: 260px;">',
'<div class="input-row hidden" style="margin-bottom: 10px;">', '<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-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>', '<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>',
@ -279,10 +279,9 @@ define([
if (props) { if (props) {
var me = this; var me = this;
// var bookmark = props.get_Bookmark(), var bookmark = props.get_Bookmark(),
// type = (bookmark === null || bookmark=='') ? c_oHyperlinkType.WebLink : c_oHyperlinkType.InternalLink; type = (bookmark === null || bookmark=='') ? c_oHyperlinkType.WebLink : c_oHyperlinkType.InternalLink;
var type = c_oHyperlinkType.WebLink;
(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);
@ -335,7 +334,7 @@ define([
url = url.replace(new RegExp("%20",'g')," "); url = url.replace(new RegExp("%20",'g')," ");
props.put_Value(url); props.put_Value(url);
// props.put_Bookmark(null); props.put_Bookmark(null);
display = url; display = url;
} else { } else {
var rec = this.internalList.getSelectedRec(); var rec = this.internalList.getSelectedRec();