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
58c6d7a3
Commit
58c6d7a3
authored
Jan 19, 2017
by
Alexander Yuzhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE mobile] Fixed display add link and insert table.
parent
3b54d5df
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
41 additions
and
16 deletions
+41
-16
apps/documenteditor/mobile/app/controller/DocumentHolder.js
apps/documenteditor/mobile/app/controller/DocumentHolder.js
+2
-2
apps/documenteditor/mobile/app/controller/add/AddImage.js
apps/documenteditor/mobile/app/controller/add/AddImage.js
+5
-2
apps/documenteditor/mobile/app/controller/add/AddOther.js
apps/documenteditor/mobile/app/controller/add/AddOther.js
+5
-2
apps/documenteditor/mobile/app/controller/add/AddShape.js
apps/documenteditor/mobile/app/controller/add/AddShape.js
+5
-2
apps/documenteditor/mobile/app/controller/add/AddTable.js
apps/documenteditor/mobile/app/controller/add/AddTable.js
+16
-3
apps/documenteditor/mobile/app/view/add/AddOther.js
apps/documenteditor/mobile/app/view/add/AddOther.js
+5
-4
apps/documenteditor/mobile/app/view/add/AddTable.js
apps/documenteditor/mobile/app/view/add/AddTable.js
+2
-0
apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js
.../spreadsheeteditor/mobile/app/controller/edit/EditCell.js
+1
-1
No files found.
apps/documenteditor/mobile/app/controller/DocumentHolder.js
View file @
58c6d7a3
...
...
@@ -123,7 +123,7 @@ define([
_view
.
hideMenu
();
DE
.
getController
(
'
AddContainer
'
).
showModal
();
DE
.
getController
(
'
AddOther
'
).
getView
(
'
AddOther
'
).
showLink
();
DE
.
getController
(
'
AddOther
'
).
getView
(
'
AddOther
'
).
showLink
(
false
);
}
else
if
(
'
openlink
'
==
eventName
)
{
_
.
some
(
_stack
,
function
(
item
)
{
if
(
item
.
get_ObjectType
()
==
Asc
.
c_oAscTypeSelectElement
.
Hyperlink
)
{
...
...
@@ -143,7 +143,7 @@ define([
},
onApiShowPopMenu
:
function
(
posX
,
posY
)
{
if
(
$
(
'
.popover.settings, .popup.settings, .picker-modal.settings
'
).
length
>
0
)
{
if
(
$
(
'
.popover.settings, .popup.settings, .picker-modal.settings
, .modal.modal-in
'
).
length
>
0
)
{
return
;
}
...
...
apps/documenteditor/mobile/app/controller/add/AddImage.js
View file @
58c6d7a3
...
...
@@ -43,8 +43,11 @@
define
([
'
core
'
,
'
documenteditor/mobile/app/view/add/AddImage
'
],
function
(
core
)
{
'
documenteditor/mobile/app/view/add/AddImage
'
,
'
jquery
'
,
'
underscore
'
,
'
backbone
'
],
function
(
core
,
view
,
$
,
_
,
Backbone
)
{
'
use strict
'
;
DE
.
Controllers
.
AddImage
=
Backbone
.
Controller
.
extend
(
_
.
extend
((
function
()
{
...
...
apps/documenteditor/mobile/app/controller/add/AddOther.js
View file @
58c6d7a3
...
...
@@ -41,8 +41,11 @@
define
([
'
core
'
,
'
documenteditor/mobile/app/view/add/AddOther
'
],
function
(
core
)
{
'
documenteditor/mobile/app/view/add/AddOther
'
,
'
jquery
'
,
'
underscore
'
,
'
backbone
'
],
function
(
core
,
view
,
$
,
_
,
Backbone
)
{
'
use strict
'
;
DE
.
Controllers
.
AddOther
=
Backbone
.
Controller
.
extend
(
_
.
extend
((
function
()
{
...
...
apps/documenteditor/mobile/app/controller/add/AddShape.js
View file @
58c6d7a3
...
...
@@ -42,8 +42,11 @@
define
([
'
core
'
,
'
documenteditor/mobile/app/view/add/AddShape
'
],
function
(
core
)
{
'
documenteditor/mobile/app/view/add/AddShape
'
,
'
jquery
'
,
'
underscore
'
,
'
backbone
'
],
function
(
core
,
view
,
$
,
_
,
Backbone
)
{
'
use strict
'
;
DE
.
Controllers
.
AddShape
=
Backbone
.
Controller
.
extend
(
_
.
extend
((
function
()
{
...
...
apps/documenteditor/mobile/app/controller/add/AddTable.js
View file @
58c6d7a3
...
...
@@ -43,8 +43,11 @@
define
([
'
core
'
,
'
documenteditor/mobile/app/view/add/AddTable
'
],
function
(
core
)
{
'
documenteditor/mobile/app/view/add/AddTable
'
,
'
jquery
'
,
'
underscore
'
,
'
backbone
'
],
function
(
core
,
view
,
$
,
_
,
Backbone
)
{
'
use strict
'
;
DE
.
Controllers
.
AddTable
=
Backbone
.
Controller
.
extend
(
_
.
extend
((
function
()
{
...
...
@@ -60,6 +63,12 @@ define([
initialize
:
function
()
{
Common
.
NotificationCenter
.
on
(
'
addcontainer:show
'
,
_
.
bind
(
this
.
initEvents
,
this
));
this
.
addListeners
({
'
AddTable
'
:
{
'
view:render
'
:
this
.
onViewRender
}
});
},
setApi
:
function
(
api
)
{
...
...
@@ -83,7 +92,11 @@ define([
me
.
api
.
asc_GetDefaultTableStyles
();
}
$
(
'
#add-table li
'
).
single
(
'
click
'
,
_
.
buffered
(
me
.
onStyleClick
,
100
,
me
));
$
(
'
#add-table li
'
).
single
(
'
click
'
,
_
.
buffered
(
this
.
onStyleClick
,
100
,
this
));
},
onViewRender
:
function
()
{
$
(
'
#add-table li
'
).
single
(
'
click
'
,
_
.
buffered
(
this
.
onStyleClick
,
100
,
this
));
},
onStyleClick
:
function
(
e
)
{
...
...
apps/documenteditor/mobile/app/view/add/AddOther.js
View file @
58c6d7a3
...
...
@@ -98,7 +98,7 @@ define([
//
},
showPage
:
function
(
templateId
)
{
showPage
:
function
(
templateId
,
animate
)
{
var
rootView
=
DE
.
getController
(
'
AddContainer
'
).
rootView
;
if
(
rootView
&&
this
.
layout
)
{
...
...
@@ -110,7 +110,8 @@ define([
}
rootView
.
router
.
load
({
content
:
$content
.
html
()
content
:
$content
.
html
(),
animatePages
:
animate
!==
false
});
this
.
fireEvent
(
'
page:show
'
,
[
this
,
templateId
]);
...
...
@@ -121,8 +122,8 @@ define([
this
.
showPage
(
'
#addother-sectionbreak
'
);
},
showLink
:
function
()
{
this
.
showPage
(
'
#addother-link
'
);
showLink
:
function
(
animate
)
{
this
.
showPage
(
'
#addother-link
'
,
animate
);
$
(
'
.page[data-page=addother-link] input[type=url]
'
).
single
(
'
input
'
,
_
.
bind
(
function
(
e
)
{
$
(
'
#add-link-insert
'
).
toggleClass
(
'
disabled
'
,
_
.
isEmpty
(
$
(
'
#add-link-url input
'
).
val
()));
...
...
apps/documenteditor/mobile/app/view/add/AddTable.js
View file @
58c6d7a3
...
...
@@ -82,6 +82,8 @@ define([
$tableStyles
.
replaceWith
(
this
.
layout
.
find
(
'
#add-table-root
'
).
html
());
}
this
.
fireEvent
(
'
view:render
'
,
this
);
return
this
;
},
...
...
apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js
View file @
58c6d7a3
...
...
@@ -103,7 +103,7 @@ define([
me
.
api
.
asc_registerCallback
(
'
asc_onInitEditorFonts
'
,
_
.
bind
(
onApiLoadFonts
,
me
));
me
.
api
.
asc_registerCallback
(
'
asc_onSelectionChanged
'
,
_
.
bind
(
me
.
onApiSelectionChanged
,
me
));
me
.
api
.
asc_registerCallback
(
'
asc_onEditorSelectionChanged
'
,
_
.
bind
(
me
.
onApiEditorSelectionChanged
,
me
));
me
.
api
.
asc_registerCallback
(
'
asc_onInitEditorStyles
'
,
_
.
bind
(
me
.
onApiInitEditorStyles
,
me
));
// TODO: It does not work until the error in the SDK
me
.
api
.
asc_registerCallback
(
'
asc_onInitEditorStyles
'
,
_
.
bind
(
me
.
onApiInitEditorStyles
,
me
));
},
setMode
:
function
(
mode
)
{
...
...
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