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
31f1c0db
Commit
31f1c0db
authored
May 06, 2016
by
Alexander Trofimov
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6 from ONLYOFFICE/feature/de-shape-settings-as-sse
Feature/de shape settings as sse
parents
d7f163e1
f6e29849
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
12 deletions
+2
-12
apps/documenteditor/embed/js/ApplicationController.js
apps/documenteditor/embed/js/ApplicationController.js
+0
-3
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+0
-3
apps/documenteditor/main/app/view/ShapeSettings.js
apps/documenteditor/main/app/view/ShapeSettings.js
+2
-4
apps/documenteditor/mobile/app/controller/Main.js
apps/documenteditor/mobile/app/controller/Main.js
+0
-2
No files found.
apps/documenteditor/embed/js/ApplicationController.js
View file @
31f1c0db
...
@@ -707,9 +707,6 @@ var ApplicationController = new(function(){
...
@@ -707,9 +707,6 @@ var ApplicationController = new(function(){
api
=
new
Asc
.
asc_docs_api
(
"
editor_sdk
"
);
api
=
new
Asc
.
asc_docs_api
(
"
editor_sdk
"
);
if
(
api
){
if
(
api
){
api
.
CreateComponents
();
api
.
Init
();
api
.
asc_registerCallback
(
'
asc_onError
'
,
onError
);
api
.
asc_registerCallback
(
'
asc_onError
'
,
onError
);
api
.
asc_registerCallback
(
'
asc_onDocumentContentReady
'
,
onDocumentContentReady
);
api
.
asc_registerCallback
(
'
asc_onDocumentContentReady
'
,
onDocumentContentReady
);
api
.
asc_registerCallback
(
'
asc_onOpenDocumentProgress
'
,
onOpenDocument
);
api
.
asc_registerCallback
(
'
asc_onOpenDocumentProgress
'
,
onOpenDocument
);
...
...
apps/documenteditor/main/app/controller/Main.js
View file @
31f1c0db
...
@@ -121,9 +121,6 @@ define([
...
@@ -121,9 +121,6 @@ define([
}
}
window
[
"
flat_desine
"
]
=
true
;
window
[
"
flat_desine
"
]
=
true
;
this
.
api
.
CreateComponents
();
this
.
api
.
Init
();
this
.
api
.
asc_registerCallback
(
'
asc_onError
'
,
_
.
bind
(
this
.
onError
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onError
'
,
_
.
bind
(
this
.
onError
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onDocumentContentReady
'
,
_
.
bind
(
this
.
onDocumentContentReady
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onDocumentContentReady
'
,
_
.
bind
(
this
.
onDocumentContentReady
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onOpenDocumentProgress
'
,
_
.
bind
(
this
.
onOpenDocument
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onOpenDocumentProgress
'
,
_
.
bind
(
this
.
onOpenDocument
,
this
));
...
...
apps/documenteditor/main/app/view/ShapeSettings.js
View file @
31f1c0db
...
@@ -607,10 +607,8 @@ define([
...
@@ -607,10 +607,8 @@ define([
this
.
api
=
api
;
this
.
api
=
api
;
if
(
this
.
api
)
{
if
(
this
.
api
)
{
this
.
api
.
asc_registerCallback
(
'
asc_onImgWrapStyleChanged
'
,
_
.
bind
(
this
.
_ImgWrapStyleChanged
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onImgWrapStyleChanged
'
,
_
.
bind
(
this
.
_ImgWrapStyleChanged
,
this
));
this
.
api
.
SetInterfaceDrawImagePlaceShape
(
'
shape-texture-img
'
);
this
.
api
.
asc_setInterfaceDrawImagePlaceShape
(
'
shape-texture-img
'
);
var
textures
=
this
.
api
.
get_PropertyStandartTextures
();
this
.
api
.
asc_registerCallback
(
'
asc_onInitStandartTextures
'
,
_
.
bind
(
this
.
onInitStandartTextures
,
this
));
if
(
textures
)
this
.
onInitStandartTextures
(
textures
);
}
}
return
this
;
return
this
;
},
},
...
...
apps/documenteditor/mobile/app/controller/Main.js
View file @
31f1c0db
...
@@ -60,8 +60,6 @@ Ext.define('DE.controller.Main', {
...
@@ -60,8 +60,6 @@ Ext.define('DE.controller.Main', {
api
=
new
Asc
.
asc_docs_api
(
"
id-sdkeditor
"
);
api
=
new
Asc
.
asc_docs_api
(
"
id-sdkeditor
"
);
api
.
SetMobileVersion
(
true
);
api
.
SetMobileVersion
(
true
);
api
.
CreateComponents
();
api
.
Init
();
api
.
initEvents2MobileAdvances
();
api
.
initEvents2MobileAdvances
();
api
.
asc_registerCallback
(
'
asc_onStartAction
'
,
Ext
.
bind
(
this
.
onLongActionBegin
,
this
));
api
.
asc_registerCallback
(
'
asc_onStartAction
'
,
Ext
.
bind
(
this
.
onLongActionBegin
,
this
));
...
...
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