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
a398c46d
Commit
a398c46d
authored
Sep 29, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PE] Open encrypted pptx.
parent
24c332b9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
1 deletion
+37
-1
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+30
-1
apps/presentationeditor/main/locale/en.json
apps/presentationeditor/main/locale/en.json
+6
-0
apps/presentationeditor/main/resources/less/app.less
apps/presentationeditor/main/resources/less/app.less
+1
-0
No files found.
apps/presentationeditor/main/app/controller/Main.js
View file @
a398c46d
...
...
@@ -48,6 +48,7 @@ define([
'
common/main/lib/component/Tooltip
'
,
'
common/main/lib/controller/Fonts
'
,
'
common/main/lib/collection/TextArt
'
,
'
common/main/lib/view/OpenDialog
'
,
'
presentationeditor/main/app/collection/ShapeGroups
'
,
'
presentationeditor/main/app/collection/SlideLayouts
'
],
function
()
{
'
use strict
'
;
...
...
@@ -122,9 +123,12 @@ define([
this
.
api
.
asc_registerCallback
(
'
asc_onDocumentName
'
,
_
.
bind
(
this
.
onDocumentName
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onPrintUrl
'
,
_
.
bind
(
this
.
onPrintUrl
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onMeta
'
,
_
.
bind
(
this
.
onMeta
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onAdvancedOptions
'
,
_
.
bind
(
this
.
onAdvancedOptions
,
this
));
Common
.
NotificationCenter
.
on
(
'
api:disconnect
'
,
_
.
bind
(
this
.
onCoAuthoringDisconnect
,
this
));
Common
.
NotificationCenter
.
on
(
'
goback
'
,
_
.
bind
(
this
.
goBack
,
this
));
this
.
isShowOpenDialog
=
false
;
// Initialize api gateway
this
.
editorConfig
=
{};
this
.
appOptions
=
{};
...
...
@@ -473,6 +477,8 @@ define([
this
.
loadMask
=
new
Common
.
UI
.
LoadMask
({
owner
:
$
(
'
#viewport
'
)});
this
.
loadMask
.
setTitle
(
title
);
if
(
!
this
.
isShowOpenDialog
)
this
.
loadMask
.
show
();
}
else
{
...
...
@@ -1514,6 +1520,29 @@ define([
if
(
url
)
this
.
iframePrint
.
src
=
url
;
},
onAdvancedOptions
:
function
(
advOptions
)
{
var
type
=
advOptions
.
asc_getOptionId
(),
me
=
this
,
dlg
;
if
(
type
==
Asc
.
c_oAscAdvancedOptionsID
.
DRM
)
{
dlg
=
new
Common
.
Views
.
OpenDialog
({
type
:
type
,
handler
:
function
(
value
)
{
me
.
isShowOpenDialog
=
false
;
if
(
me
&&
me
.
api
)
{
me
.
api
.
asc_setAdvancedOptions
(
type
,
new
Asc
.
asc_CDRMAdvancedOptions
(
value
));
me
.
loadMask
&&
me
.
loadMask
.
show
();
}
}
});
}
if
(
dlg
)
{
this
.
isShowOpenDialog
=
true
;
this
.
loadMask
&&
this
.
loadMask
.
hide
();
this
.
onLongActionEnd
(
Asc
.
c_oAscAsyncActionType
.
BlockInteraction
,
LoadingDocument
);
dlg
.
show
();
}
},
updatePlugins
:
function
(
plugins
)
{
// plugins from config
if
(
!
plugins
||
!
plugins
.
pluginsData
||
plugins
.
pluginsData
.
length
<
1
)
return
;
...
...
apps/presentationeditor/main/locale/en.json
View file @
a398c46d
...
...
@@ -95,6 +95,12 @@
"Common.Views.InsertTableDialog.txtMinText"
:
"The minimum value for this field is {0}."
,
"Common.Views.InsertTableDialog.txtRows"
:
"Number of Rows"
,
"Common.Views.InsertTableDialog.txtTitle"
:
"Table Size"
,
"Common.Views.OpenDialog.cancelButtonText"
:
"Cancel"
,
"Common.Views.OpenDialog.okButtonText"
:
"OK"
,
"Common.Views.OpenDialog.txtEncoding"
:
"Encoding "
,
"Common.Views.OpenDialog.txtPassword"
:
"Password"
,
"Common.Views.OpenDialog.txtTitle"
:
"Choose %1 options"
,
"Common.Views.OpenDialog.txtTitleProtected"
:
"Protected File"
,
"Common.Views.PluginDlg.textLoading"
:
"Loading"
,
"Common.Views.Plugins.strPlugins"
:
"Plugins"
,
"Common.Views.Plugins.textLoading"
:
"Loading"
,
...
...
apps/presentationeditor/main/resources/less/app.less
View file @
a398c46d
...
...
@@ -109,6 +109,7 @@
@import "../../../../common/main/resources/less/scroller.less";
@import "../../../../common/main/resources/less/synchronize-tip.less";
@import "../../../../common/main/resources/less/common.less";
@import "../../../../common/main/resources/less/opendialog.less";
@import "../../../../common/main/resources/less/plugins.less";
// App
...
...
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