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
11367d01
Commit
11367d01
authored
Apr 11, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 18314.
parent
4753d519
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
17 deletions
+28
-17
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+2
-3
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+13
-6
apps/spreadsheeteditor/main/app/controller/Main.js
apps/spreadsheeteditor/main/app/controller/Main.js
+13
-8
No files found.
apps/documenteditor/main/app/controller/Main.js
View file @
11367d01
...
...
@@ -772,12 +772,11 @@ define([
if
(
tips
.
length
)
me
.
showTips
(
tips
);
}
document
.
removeEventListener
(
'
visibilitychange
'
,
checkWarns
);
}
if
(
typeof
document
.
hidden
!==
'
undefined
'
&&
document
.
hidden
)
{
document
.
addEventListener
(
'
visibilitychange
'
,
function
()
{
setTimeout
(
checkWarns
,
50
);
});
document
.
addEventListener
(
'
visibilitychange
'
,
checkWarns
);
}
else
checkWarns
();
me
.
api
.
asc_registerCallback
(
'
asc_onStartAction
'
,
_
.
bind
(
me
.
onLongActionBegin
,
me
));
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
11367d01
...
...
@@ -551,8 +551,7 @@ define([
return
;
var
me
=
this
,
value
,
tips
=
[];
value
;
me
.
_isDocReady
=
true
;
...
...
@@ -564,13 +563,21 @@ define([
var
zf
=
(
value
!==
null
)
?
parseInt
(
value
)
:
-
1
;
(
zf
==
-
1
)
?
this
.
api
.
zoomFitToPage
()
:
this
.
api
.
zoom
(
zf
);
if
(
!
window
[
'
AscDesktopEditor
'
])
{
Common
.
Utils
.
isIE9m
&&
tips
.
push
(
me
.
warnBrowserIE9
);
!
Common
.
Utils
.
isGecko
&&
(
Math
.
abs
(
me
.
getBrowseZoomLevel
()
-
1
)
>
0.1
)
&&
tips
.
push
(
Common
.
Utils
.
String
.
platformKey
(
me
.
warnBrowserZoom
,
'
{0}
'
));
function
checkWarns
()
{
if
(
!
window
[
'
AscDesktopEditor
'
])
{
var
tips
=
[];
Common
.
Utils
.
isIE9m
&&
tips
.
push
(
me
.
warnBrowserIE9
);
!
Common
.
Utils
.
isGecko
&&
(
Math
.
abs
(
me
.
getBrowseZoomLevel
()
-
1
)
>
0.1
)
&&
tips
.
push
(
Common
.
Utils
.
String
.
platformKey
(
me
.
warnBrowserZoom
,
'
{0}
'
));
if
(
tips
.
length
)
me
.
showTips
(
tips
);
if
(
tips
.
length
)
me
.
showTips
(
tips
);
}
document
.
removeEventListener
(
'
visibilitychange
'
,
checkWarns
);
}
if
(
typeof
document
.
hidden
!==
'
undefined
'
&&
document
.
hidden
)
{
document
.
addEventListener
(
'
visibilitychange
'
,
checkWarns
);
}
else
checkWarns
();
me
.
api
.
asc_registerCallback
(
'
asc_onStartAction
'
,
_
.
bind
(
me
.
onLongActionBegin
,
me
));
me
.
api
.
asc_registerCallback
(
'
asc_onEndAction
'
,
_
.
bind
(
me
.
onLongActionEnd
,
me
));
me
.
api
.
asc_registerCallback
(
'
asc_onCoAuthoringDisconnect
'
,
_
.
bind
(
me
.
onCoAuthoringDisconnect
,
me
));
...
...
apps/spreadsheeteditor/main/app/controller/Main.js
View file @
11367d01
...
...
@@ -540,8 +540,7 @@ define([
return
;
var
me
=
this
,
value
,
tips
=
[];
value
;
me
.
_isDocReady
=
true
;
...
...
@@ -667,16 +666,22 @@ define([
$
(
document
).
on
(
'
contextmenu
'
,
_
.
bind
(
me
.
onContextMenu
,
me
));
// me.getViewport().getEl().un('keypress', me.lockEscapeKey, me);
if
(
!
window
[
'
AscDesktopEditor
'
]
)
{
Common
.
Utils
.
isIE9m
&&
tips
.
push
(
me
.
warnBrowserIE9
);
!
Common
.
Utils
.
isGecko
&&
!
me
.
appOptions
.
isEditMailMerge
&&
!
me
.
appOptions
.
isEditDiagram
&&
!
me
.
appOptions
.
nativeApp
&&
function
checkWarns
(
)
{
if
(
!
window
[
'
AscDesktopEditor
'
])
{
var
tips
=
[];
Common
.
Utils
.
isIE9m
&&
tips
.
push
(
me
.
warnBrowserIE9
);
!
Common
.
Utils
.
isGecko
&&
!
me
.
appOptions
.
isEditMailMerge
&&
!
me
.
appOptions
.
isEditDiagram
&&
!
me
.
appOptions
.
nativeApp
&&
(
Math
.
abs
(
me
.
getBrowseZoomLevel
()
-
1
)
>
0.1
)
&&
tips
.
push
(
Common
.
Utils
.
String
.
platformKey
(
me
.
warnBrowserZoom
,
'
{0}
'
));
if
(
tips
.
length
)
me
.
showTips
(
tips
);
if
(
tips
.
length
)
me
.
showTips
(
tips
);
}
document
.
removeEventListener
(
'
visibilitychange
'
,
checkWarns
);
}
if
(
typeof
document
.
hidden
!==
'
undefined
'
&&
document
.
hidden
)
{
document
.
addEventListener
(
'
visibilitychange
'
,
checkWarns
);
}
else
checkWarns
();
if
(
this
.
_state
.
licenseWarning
)
{
value
=
Common
.
localStorage
.
getItem
(
"
de-license-warning
"
);
value
=
(
value
!==
null
)
?
parseInt
(
value
)
:
0
;
...
...
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