Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
7a52154c
Commit
7a52154c
authored
Mar 02, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PE mobile] Bug with adding and editing link.
parent
62b2fbfe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
13 deletions
+4
-13
apps/presentationeditor/mobile/app/controller/add/AddLink.js
apps/presentationeditor/mobile/app/controller/add/AddLink.js
+2
-7
apps/presentationeditor/mobile/app/controller/edit/EditLink.js
...presentationeditor/mobile/app/controller/edit/EditLink.js
+2
-6
No files found.
apps/presentationeditor/mobile/app/controller/add/AddLink.js
View file @
7a52154c
...
...
@@ -60,8 +60,7 @@ define([
_linkType
=
c_oHyperlinkType
.
WebLink
,
_slideLink
=
0
,
_slideNum
=
0
,
_slidesCount
=
0
,
_isDisplayChanged
=
false
;
_slidesCount
=
0
;
return
{
models
:
[],
...
...
@@ -106,7 +105,6 @@ define([
if
(
$target
&&
$target
.
prop
(
'
id
'
)
===
'
add-link
'
)
{
_linkType
=
c_oHyperlinkType
.
WebLink
;
_slideLink
=
_slideNum
=
0
;
_isDisplayChanged
=
false
;
var
text
=
this
.
api
.
can_AddHyperlink
();
if
(
text
!==
false
)
{
$
(
'
#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-slidenumber li
'
).
single
(
'
click
'
,
_
.
buffered
(
me
.
onSlideLink
,
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
);
},
...
...
@@ -232,7 +227,7 @@ define([
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
);
}
else
props
.
put_Text
(
null
);
...
...
apps/presentationeditor/mobile/app/controller/edit/EditLink.js
View file @
7a52154c
...
...
@@ -65,8 +65,7 @@ define([
_linkType
=
c_oHyperlinkType
.
WebLink
,
_slideLink
=
0
,
_slideNum
=
0
,
_slidesCount
=
0
,
_isDisplayChanged
=
false
;
_slidesCount
=
0
;
return
{
models
:
[],
...
...
@@ -213,9 +212,6 @@ define([
$
(
'
#page-editlink-type li
'
).
single
(
'
click
'
,
_
.
buffered
(
me
.
onLinkType
,
100
,
me
));
$
(
'
#page-editlink-slidenumber li
'
).
single
(
'
click
'
,
_
.
buffered
(
me
.
onSlideLink
,
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
);
},
...
...
@@ -275,7 +271,7 @@ define([
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
);
}
else
props
.
put_Text
(
null
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment