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

[PE mobile] Bug with adding and editing link.

Browse source
This commit is contained in:
Julia Radzhabova 2017-03-02 15:30:10 +03:00
parent 62b2fbfecf
commit 7a52154c64
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/presentationeditor/mobile/app/controller/add/AddLink.js
View file

@ -60,8 +60,7 @@ define([
_linkType = c_oHyperlinkType.WebLink, _linkType = c_oHyperlinkType.WebLink,
_slideLink = 0, _slideLink = 0,
_slideNum = 0, _slideNum = 0,
_slidesCount = 0, _slidesCount = 0;
_isDisplayChanged = false;
return { return {
models: [], models: [],
@ -106,7 +105,6 @@ define([
if ($target && $target.prop('id') === 'add-link') { if ($target && $target.prop('id') === 'add-link') {
_linkType = c_oHyperlinkType.WebLink; _linkType = c_oHyperlinkType.WebLink;
_slideLink = _slideNum = 0; _slideLink = _slideNum = 0;
_isDisplayChanged = false;
var text = this.api.can_AddHyperlink(); var text = this.api.can_AddHyperlink();
if (text !== false) { if (text !== false) {
$('#add-link-display input').val((text !== null) ? text : this.textDefault); $('#add-link-display input').val((text !== null) ? text : this.textDefault);
@ -170,9 +168,6 @@ define([
$('#page-addlink-type li').single('click', _.buffered(me.onLinkType, 100, me)); $('#page-addlink-type li').single('click', _.buffered(me.onLinkType, 100, me));
$('#page-addlink-slidenumber li').single('click', _.buffered(me.onSlideLink, 100, me)); $('#page-addlink-slidenumber li').single('click', _.buffered(me.onSlideLink, 100, me));
$('#addlink-slide-number .button').single('click',_.buffered(me.onSlideNumber, 100, me)); $('#addlink-slide-number .button').single('click',_.buffered(me.onSlideNumber, 100, me));
$('#add-link-display input[type="text"]').single('input', _.bind(function(e) {
_isDisplayChanged = true;
}, this));
me.initSettings(pageId); me.initSettings(pageId);
}, },
@ -232,7 +227,7 @@ define([
def_display = slidetip; def_display = slidetip;
} }
if (!$('#add-link-display').hasClass('disabled') && (_isDisplayChanged || _.isEmpty(display))) { if (!$('#add-link-display').hasClass('disabled')) {
props.put_Text(_.isEmpty(display) ? def_display : display); props.put_Text(_.isEmpty(display) ? def_display : display);
} else } else
props.put_Text(null); props.put_Text(null);

8
apps/presentationeditor/mobile/app/controller/edit/EditLink.js
View file

@ -65,8 +65,7 @@ define([
_linkType = c_oHyperlinkType.WebLink, _linkType = c_oHyperlinkType.WebLink,
_slideLink = 0, _slideLink = 0,
_slideNum = 0, _slideNum = 0,
_slidesCount = 0, _slidesCount = 0;
_isDisplayChanged = false;
return { return {
models: [], models: [],
@ -213,9 +212,6 @@ define([
$('#page-editlink-type li').single('click', _.buffered(me.onLinkType, 100, me)); $('#page-editlink-type li').single('click', _.buffered(me.onLinkType, 100, me));
$('#page-editlink-slidenumber li').single('click', _.buffered(me.onSlideLink, 100, me)); $('#page-editlink-slidenumber li').single('click', _.buffered(me.onSlideLink, 100, me));
$('#editlink-slide-number .button').single('click',_.buffered(me.onSlideNumber, 100, me)); $('#editlink-slide-number .button').single('click',_.buffered(me.onSlideNumber, 100, me));
$('#edit-link-display input[type="text"]').single('input', _.bind(function(e) {
_isDisplayChanged = true;
}, this));
me.initSettings(pageId); me.initSettings(pageId);
}, },
@ -275,7 +271,7 @@ define([
def_display = slidetip; def_display = slidetip;
} }
if (!$('#edit-link-display').hasClass('disabled') && (_isDisplayChanged || _.isEmpty(display))) { if (!$('#edit-link-display').hasClass('disabled')) {
props.put_Text(_.isEmpty(display) ? def_display : display); props.put_Text(_.isEmpty(display) ? def_display : display);
} else } else
props.put_Text(null); props.put_Text(null);