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
f2df515f
Commit
f2df515f
authored
Mar 28, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE][PE] Bug 32008
parent
ca1cb546
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
2 deletions
+8
-2
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+1
-1
apps/documenteditor/main/app/view/DocumentHolder.js
apps/documenteditor/main/app/view/DocumentHolder.js
+3
-0
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+1
-1
apps/presentationeditor/main/app/view/DocumentHolder.js
apps/presentationeditor/main/app/view/DocumentHolder.js
+3
-0
No files found.
apps/documenteditor/main/app/controller/Main.js
View file @
f2df515f
...
...
@@ -141,7 +141,7 @@ define([
/*
* TODO: Workaround bug #25004. Clipboard feature processing in sdk.
*/
if
(
!
(
Common
.
Utils
.
isSafari
&&
Common
.
Utils
.
isMac
))
{
if
(
!
(
Common
.
Utils
.
isSafari
&&
Common
.
Utils
.
isMac
)
&&
!
/area_id/
.
test
(
e
.
target
.
id
)
)
{
me
.
api
.
asc_enableKeyEvents
(
true
);
if
(
/msg-reply/
.
test
(
e
.
target
.
className
))
me
.
dontCloseDummyComment
=
false
;
...
...
apps/documenteditor/main/app/view/DocumentHolder.js
View file @
f2df515f
...
...
@@ -78,6 +78,9 @@ define([
menu
.
alignPosition
();
}
_
.
delay
(
function
()
{
var
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-inputmode
"
);
// only for hieroglyphs mode
if
(
value
!==
null
&&
parseInt
(
value
)
==
1
)
me
.
api
.
asc_enableKeyEvents
(
false
);
menu
.
cmpEl
.
focus
();
},
10
);
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
f2df515f
...
...
@@ -124,7 +124,7 @@ define([
/*
* TODO: Workaround bug #25004. Clipboard feature processing in sdk.
*/
if
(
!
(
Common
.
Utils
.
isSafari
&&
Common
.
Utils
.
isMac
))
{
if
(
!
(
Common
.
Utils
.
isSafari
&&
Common
.
Utils
.
isMac
)
&&
!
/area_id/
.
test
(
e
.
target
.
id
)
)
{
me
.
api
.
asc_enableKeyEvents
(
true
);
if
(
/msg-reply/
.
test
(
e
.
target
.
className
))
me
.
dontCloseDummyComment
=
false
;
...
...
apps/presentationeditor/main/app/view/DocumentHolder.js
View file @
f2df515f
...
...
@@ -69,6 +69,9 @@ define([
menu
.
alignPosition
();
}
_
.
delay
(
function
()
{
var
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-inputmode
"
);
// only for hieroglyphs mode
if
(
value
!==
null
&&
parseInt
(
value
)
==
1
)
me
.
api
.
asc_enableKeyEvents
(
false
);
menu
.
cmpEl
.
focus
();
},
10
);
...
...
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