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
ce8d332d
Commit
ce8d332d
authored
Mar 15, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Delete unused method "applyEditRights" from api.
parent
00f8c803
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
232 deletions
+18
-232
apps/api/documents/api.js
apps/api/documents/api.js
+1
-2
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+6
-57
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+6
-60
apps/spreadsheeteditor/main/app/controller/Main.js
apps/spreadsheeteditor/main/app/controller/Main.js
+5
-51
apps/spreadsheeteditor/mobile/app/controller/Main.js
apps/spreadsheeteditor/mobile/app/controller/Main.js
+0
-62
No files found.
apps/api/documents/api.js
View file @
ce8d332d
...
...
@@ -270,7 +270,7 @@
res
;
if
(
msg
.
event
===
'
onRequestEditRights
'
&&
!
handler
)
{
_applyEditRights
(
false
,
'
handler is
\'
n
defined
'
);
_applyEditRights
(
false
,
'
handler is
n
\'
t
defined
'
);
}
else
if
(
msg
.
event
===
'
onInternalMessage
'
&&
msg
.
data
&&
msg
.
data
.
type
==
'
localstorage
'
)
{
_callLocalStorage
(
msg
.
data
.
data
);
}
else
{
...
...
@@ -546,7 +546,6 @@
return
{
showError
:
_showError
,
showMessage
:
_showMessage
,
applyEditRights
:
_applyEditRights
,
processSaveResult
:
_processSaveResult
,
processRightsChange
:
_processRightsChange
,
denyEditingRights
:
_denyEditingRights
,
...
...
apps/documenteditor/main/app/controller/Main.js
View file @
ce8d332d
...
...
@@ -708,64 +708,13 @@ define([
},
onApplyEditRights
:
function
(
data
)
{
var
application
=
this
.
getApplication
();
application
.
getController
(
'
Statusbar
'
).
setStatusCaption
(
''
);
this
.
getApplication
().
getController
(
'
Statusbar
'
).
setStatusCaption
(
''
);
if
(
data
)
{
if
(
data
.
allowed
)
{
data
.
requestrights
=
true
;
this
.
appOptions
.
isEdit
=
true
;
this
.
onLongActionBegin
(
Asc
.
c_oAscAsyncActionType
[
'
BlockInteraction
'
],
ApplyEditRights
);
var
me
=
this
;
setTimeout
(
function
(){
me
.
applyModeCommonElements
();
me
.
applyModeEditorElements
();
me
.
api
.
asc_setViewMode
(
false
);
var
timer_rp
=
setInterval
(
function
(){
clearInterval
(
timer_rp
);
var
toolbarController
=
application
.
getController
(
'
Toolbar
'
),
rightmenuController
=
application
.
getController
(
'
RightMenu
'
),
leftmenuController
=
application
.
getController
(
'
LeftMenu
'
),
documentHolderController
=
application
.
getController
(
'
DocumentHolder
'
),
fontsControllers
=
application
.
getController
(
'
Common.Controllers.Fonts
'
);
leftmenuController
.
setMode
(
me
.
appOptions
).
createDelayedElements
();
rightmenuController
.
createDelayedElements
();
Common
.
NotificationCenter
.
trigger
(
'
layout:changed
'
,
'
main
'
);
var
timer_sl
=
setInterval
(
function
(){
if
(
window
.
styles_loaded
)
{
clearInterval
(
timer_sl
);
documentHolderController
.
getView
(
'
DocumentHolder
'
).
createDelayedElements
();
documentHolderController
.
getView
(
'
DocumentHolder
'
).
changePosition
();
me
.
loadLanguages
();
var
shapes
=
me
.
api
.
asc_getPropertyEditorShapes
();
if
(
shapes
)
me
.
fillAutoShapes
(
shapes
[
0
],
shapes
[
1
]);
me
.
fillTextArt
(
me
.
api
.
asc_getTextArtPreviews
());
me
.
updateThemeColors
();
toolbarController
.
activateControls
();
me
.
api
.
UpdateInterfaceState
();
}
},
50
);
},
50
);
},
100
);
}
else
{
Common
.
UI
.
info
({
title
:
this
.
requestEditFailedTitleText
,
msg
:
data
.
message
||
this
.
requestEditFailedMessageText
});
}
if
(
data
&&
!
data
.
allowed
)
{
Common
.
UI
.
info
({
title
:
this
.
requestEditFailedTitleText
,
msg
:
data
.
message
||
this
.
requestEditFailedMessageText
});
}
},
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
ce8d332d
...
...
@@ -510,67 +510,13 @@ define([
},
onApplyEditRights
:
function
(
data
)
{
var
application
=
this
.
getApplication
();
application
.
getController
(
'
Statusbar
'
).
setStatusCaption
(
''
);
if
(
data
)
{
if
(
data
.
allowed
)
{
data
.
requestrights
=
true
;
this
.
appOptions
.
isEdit
=
true
;
this
.
onLongActionBegin
(
Asc
.
c_oAscAsyncActionType
[
'
BlockInteraction
'
],
ApplyEditRights
);
var
me
=
this
;
setTimeout
(
function
(){
me
.
applyModeCommonElements
();
me
.
applyModeEditorElements
(
'
view
'
);
me
.
api
.
asc_setViewMode
(
false
);
var
timer_rp
=
setInterval
(
function
(){
clearInterval
(
timer_rp
);
var
toolbarController
=
application
.
getController
(
'
Toolbar
'
),
viewportController
=
application
.
getController
(
'
Viewport
'
),
rightmenuController
=
application
.
getController
(
'
RightMenu
'
),
leftmenuController
=
application
.
getController
(
'
LeftMenu
'
),
documentHolderController
=
application
.
getController
(
'
DocumentHolder
'
),
fontsControllers
=
application
.
getController
(
'
Common.Controllers.Fonts
'
);
leftmenuController
.
setMode
(
me
.
appOptions
).
createDelayedElements
();
rightmenuController
.
createDelayedElements
();
Common
.
NotificationCenter
.
trigger
(
'
layout:changed
'
,
'
main
'
);
var
timer_sl
=
setInterval
(
function
(){
if
(
window
.
styles_loaded
)
{
clearInterval
(
timer_sl
);
documentHolderController
.
getView
(
'
DocumentHolder
'
).
createDelayedElements
();
documentHolderController
.
getView
(
'
DocumentHolder
'
).
changePosition
();
// me.getController('Common.controller.CommentsPopover').onDocumentContentReady();
// me.getController('Search').setMode({isEdit: me.modeEdit});
me
.
api
.
asc_registerCallback
(
'
asc_onFocusObject
'
,
_
.
bind
(
me
.
onFocusObject
,
me
));
me
.
api
.
asc_registerCallback
(
'
asc_onUpdateLayout
'
,
_
.
bind
(
me
.
fillLayoutsStore
,
me
));
// slide layouts loading
me
.
updateThemeColors
();
var
shapes
=
me
.
api
.
asc_getPropertyEditorShapes
();
if
(
shapes
)
me
.
fillAutoShapes
(
shapes
[
0
],
shapes
[
1
]);
me
.
fillTextArt
(
me
.
api
.
asc_getTextArtPreviews
());
toolbarController
.
activateControls
();
this
.
getApplication
().
getController
(
'
Statusbar
'
).
setStatusCaption
(
''
);
me
.
api
.
UpdateInterfaceState
();
}
},
50
);
},
50
);
},
100
);
}
else
{
Common
.
UI
.
info
({
title
:
this
.
requestEditFailedTitleText
,
msg
:
data
.
message
||
this
.
requestEditFailedMessageText
});
}
if
(
data
&&
!
data
.
allowed
)
{
Common
.
UI
.
info
({
title
:
this
.
requestEditFailedTitleText
,
msg
:
data
.
message
||
this
.
requestEditFailedMessageText
});
}
},
...
...
apps/spreadsheeteditor/main/app/controller/Main.js
View file @
ce8d332d
...
...
@@ -514,57 +514,11 @@ define([
},
onApplyEditRights
:
function
(
data
)
{
if
(
data
)
{
if
(
data
.
allowed
)
{
this
.
onLongActionBegin
(
Asc
.
c_oAscAsyncActionType
[
'
BlockInteraction
'
],
ApplyEditRights
);
this
.
appOptions
.
isEdit
=
true
;
var
me
=
this
;
setTimeout
(
function
(){
me
.
applyModeCommonElements
();
me
.
applyModeEditorElements
(
'
view
'
);
me
.
api
.
asc_setViewMode
(
false
);
var
application
=
me
.
getApplication
();
var
documentHolderController
=
application
.
getController
(
'
DocumentHolder
'
);
application
.
getController
(
'
LeftMenu
'
).
setMode
(
me
.
appOptions
).
createDelayedElements
();
Common
.
NotificationCenter
.
trigger
(
'
layout:changed
'
,
'
main
'
);
var
timer_sl
=
setInterval
(
function
(){
if
(
window
.
styles_loaded
)
{
clearInterval
(
timer_sl
);
documentHolderController
.
getView
(
'
DocumentHolder
'
).
createDelayedElements
();
documentHolderController
.
resetApi
();
application
.
getController
(
'
Toolbar
'
).
createDelayedElements
();
application
.
getController
(
'
RightMenu
'
).
createDelayedElements
();
application
.
getController
(
'
Statusbar
'
).
getView
(
'
Statusbar
'
).
update
();
application
.
getController
(
'
CellEditor
'
).
setMode
(
me
.
appOptions
);
me
.
api
.
asc_registerCallback
(
'
asc_onSaveUrl
'
,
_
.
bind
(
me
.
onSaveUrl
,
me
));
me
.
api
.
asc_registerCallback
(
'
asc_onDocumentModifiedChanged
'
,
_
.
bind
(
me
.
onDocumentModifiedChanged
,
me
));
me
.
api
.
asc_registerCallback
(
'
asc_onDocumentCanSaveChanged
'
,
_
.
bind
(
me
.
onDocumentCanSaveChanged
,
me
));
me
.
api
.
asc_registerCallback
(
'
asc_onDownloadUrl
'
,
_
.
bind
(
me
.
onDownloadUrl
,
me
));
var
shapes
=
me
.
api
.
asc_getPropertyEditorShapes
();
if
(
shapes
)
me
.
fillAutoShapes
(
shapes
[
0
],
shapes
[
1
]);
me
.
fillTextArt
(
me
.
api
.
asc_getTextArtPreviews
());
me
.
updateThemeColors
();
application
.
getController
(
'
FormulaDialog
'
).
setApi
(
me
.
api
);
}
},
50
);
},
50
);
}
else
{
Common
.
UI
.
info
({
title
:
this
.
requestEditFailedTitleText
,
msg
:
data
.
message
||
this
.
requestEditFailedMessageText
});
}
if
(
data
&&
!
data
.
allowed
)
{
Common
.
UI
.
info
({
title
:
this
.
requestEditFailedTitleText
,
msg
:
data
.
message
||
this
.
requestEditFailedMessageText
});
}
},
...
...
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file @
ce8d332d
...
...
@@ -435,68 +435,6 @@ define([
}
},
onApplyEditRights
:
function
(
data
)
{
// var application = this.getApplication();
// application.getController('Statusbar').setStatusCaption('');
//
// if (data) {
// if (data.allowed) {
// data.requestrights = true;
// this.appOptions.isEdit= true;
//
// this.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction,ApplyEditRights);
//
// var me = this;
// setTimeout(function(){
// me.applyModeCommonElements();
// me.applyModeEditorElements();
// me.api.asc_setViewMode(false);
//
// var timer_rp = setInterval(function(){
// clearInterval(timer_rp);
//
// var toolbarController = application.getController('Toolbar'),
// rightmenuController = application.getController('RightMenu'),
// leftmenuController = application.getController('LeftMenu'),
// documentHolderController = application.getController('DocumentHolder'),
// fontsControllers = application.getController('Common.Controllers.Fonts');
//
// leftmenuController.setMode(me.appOptions).createDelayedElements();
//
// rightmenuController.createDelayedElements();
//
// Common.NotificationCenter.trigger('layout:changed', 'main');
//
// var timer_sl = setInterval(function(){
// if (window.styles_loaded) {
// clearInterval(timer_sl);
//
// documentHolderController.getView('DocumentHolder').createDelayedElements();
// documentHolderController.getView('DocumentHolder').changePosition();
// me.loadLanguages();
//
// var shapes = me.api.asc_getPropertyEditorShapes();
// if (shapes)
// me.fillAutoShapes(shapes[0], shapes[1]);
//
// me.fillTextArt(me.api.asc_getTextArtPreviews());
// me.updateThemeColors();
// toolbarController.activateControls();
//
// me.api.UpdateInterfaceState();
// }
// }, 50);
// },50);
// }, 100);
// } else {
// Common.UI.info({
// title: this.requestEditFailedTitleText,
// msg: data.message || this.requestEditFailedMessageText
// });
// }
// }
},
onDocumentContentReady
:
function
()
{
if
(
this
.
_isDocReady
)
return
;
...
...
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