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
25259f19
Commit
25259f19
authored
Nov 30, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PE mobile] Insert tables.
parent
1d6e1db6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
300 additions
and
5 deletions
+300
-5
apps/presentationeditor/mobile/app-dev.js
apps/presentationeditor/mobile/app-dev.js
+2
-2
apps/presentationeditor/mobile/app.js
apps/presentationeditor/mobile/app.js
+2
-2
apps/presentationeditor/mobile/app/controller/add/AddContainer.js
...sentationeditor/mobile/app/controller/add/AddContainer.js
+3
-1
apps/presentationeditor/mobile/app/controller/add/AddTable.js
.../presentationeditor/mobile/app/controller/add/AddTable.js
+177
-0
apps/presentationeditor/mobile/app/template/AddTable.template
.../presentationeditor/mobile/app/template/AddTable.template
+12
-0
apps/presentationeditor/mobile/app/view/add/AddTable.js
apps/presentationeditor/mobile/app/view/add/AddTable.js
+104
-0
No files found.
apps/presentationeditor/mobile/app-dev.js
View file @
25259f19
...
...
@@ -148,7 +148,7 @@ require([
// 'EditChart',
// 'EditHyperlink',
'
AddContainer
'
,
//
'AddTable',
'
AddTable
'
,
'
AddShape
'
,
'
AddImage
'
// 'AddOther'
...
...
@@ -213,7 +213,7 @@ require([
// 'presentationeditor/mobile/app/controller/edit/EditChart',
// 'presentationeditor/mobile/app/controller/edit/EditHyperlink',
'
presentationeditor/mobile/app/controller/add/AddContainer
'
,
//
'presentationeditor/mobile/app/controller/add/AddTable',
'
presentationeditor/mobile/app/controller/add/AddTable
'
,
'
presentationeditor/mobile/app/controller/add/AddShape
'
,
'
presentationeditor/mobile/app/controller/add/AddImage
'
// 'presentationeditor/mobile/app/controller/add/AddOther'
...
...
apps/presentationeditor/mobile/app.js
View file @
25259f19
...
...
@@ -159,7 +159,7 @@ require([
// 'EditChart',
// 'EditHyperlink',
'
AddContainer
'
,
//
'AddTable',
'
AddTable
'
,
'
AddShape
'
,
'
AddImage
'
// 'AddOther'
...
...
@@ -224,7 +224,7 @@ require([
// 'presentationeditor/mobile/app/controller/edit/EditChart',
// 'presentationeditor/mobile/app/controller/edit/EditHyperlink',
'
presentationeditor/mobile/app/controller/add/AddContainer
'
,
//
'presentationeditor/mobile/app/controller/add/AddTable',
'
presentationeditor/mobile/app/controller/add/AddTable
'
,
'
presentationeditor/mobile/app/controller/add/AddShape
'
,
'
presentationeditor/mobile/app/controller/add/AddImage
'
// 'presentationeditor/mobile/app/controller/add/AddOther'
...
...
apps/presentationeditor/mobile/app/controller/add/AddContainer.js
View file @
25259f19
...
...
@@ -112,7 +112,9 @@ define([
addViews
.
push
({
caption
:
me
.
textTable
,
id
:
'
add-table
'
,
layout
:
me
.
_dummyEditController
().
getLayout
()
layout
:
PE
.
getController
(
'
AddTable
'
)
.
getView
(
'
AddTable
'
)
.
rootLayout
()
});
addViews
.
push
({
...
...
apps/presentationeditor/mobile/app/controller/add/AddTable.js
0 → 100644
View file @
25259f19
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* AddTable.js
* Presentation Editor
*
* Created by Julia Radzhabova on 11/30/16
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
*
*/
define
([
'
core
'
,
'
presentationeditor/mobile/app/view/add/AddTable
'
],
function
(
core
)
{
'
use strict
'
;
PE
.
Controllers
.
AddTable
=
Backbone
.
Controller
.
extend
(
_
.
extend
((
function
()
{
var
_styles
=
[];
return
{
models
:
[],
collections
:
[],
views
:
[
'
AddTable
'
],
initialize
:
function
()
{
Common
.
NotificationCenter
.
on
(
'
addcontainer:show
'
,
_
.
bind
(
this
.
initEvents
,
this
));
},
setApi
:
function
(
api
)
{
var
me
=
this
;
me
.
api
=
api
;
me
.
api
.
asc_registerCallback
(
'
asc_onInitTableTemplates
'
,
_
.
bind
(
me
.
onApiInitTemplates
,
me
));
},
onLaunch
:
function
()
{
this
.
createView
(
'
AddTable
'
).
render
();
},
initEvents
:
function
()
{
var
me
=
this
;
if
(
_styles
.
length
<
1
)
{
me
.
api
.
asc_GetDefaultTableStyles
();
}
$
(
'
#add-table li
'
).
single
(
'
click
'
,
_
.
buffered
(
me
.
onStyleClick
,
100
,
me
));
},
onStyleClick
:
function
(
e
)
{
var
me
=
this
,
$target
=
$
(
e
.
currentTarget
),
type
=
$target
.
data
(
'
type
'
);
PE
.
getController
(
'
AddContainer
'
).
hideModal
();
_
.
delay
(
function
()
{
if
(
$target
)
{
var
picker
;
var
modal
=
uiApp
.
modal
({
title
:
me
.
textTableSize
,
text
:
''
,
afterText
:
'
<div class="content-block">
'
+
'
<div class="row">
'
+
'
<div class="col-50">
'
+
me
.
textColumns
+
'
</div>
'
+
'
<div class="col-50">
'
+
me
.
textRows
+
'
</div>
'
+
'
</div>
'
+
'
<div id="picker-table-size"></div>
'
+
'
</div>
'
,
buttons
:
[
{
text
:
me
.
textCancel
},
{
text
:
'
OK
'
,
bold
:
true
,
onClick
:
function
()
{
var
size
=
picker
.
value
;
if
(
me
.
api
)
{
me
.
api
.
put_Table
(
parseInt
(
size
[
0
]),
parseInt
(
size
[
1
]));
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_TableStyle
(
type
);
me
.
api
.
tblApply
(
properties
);
}
}
}
]
});
picker
=
uiApp
.
picker
({
container
:
'
#picker-table-size
'
,
toolbar
:
false
,
rotateEffect
:
true
,
value
:
[
3
,
3
],
cols
:
[{
textAlign
:
'
left
'
,
values
:
[
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
]
},
{
values
:
[
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
]
}]
});
// Vertical align
$$
(
modal
).
css
({
marginTop
:
-
Math
.
round
(
$$
(
modal
).
outerHeight
()
/
2
)
+
'
px
'
});
}
},
300
);
},
// Public
getStyles
:
function
()
{
return
_styles
;
},
// API handlers
onApiInitTemplates
:
function
(
templates
){
_styles
=
[];
_
.
each
(
templates
,
function
(
template
){
_styles
.
push
({
imageUrl
:
template
.
get_Image
(),
templateId
:
template
.
get_Id
()
});
});
Common
.
SharedSettings
.
set
(
'
tablestyles
'
,
_styles
);
Common
.
NotificationCenter
.
trigger
(
'
tablestyles:load
'
,
_styles
);
},
textTableSize
:
'
Table Size
'
,
textColumns
:
'
Columns
'
,
textRows
:
'
Rows
'
,
textCancel
:
'
Cancel
'
}
})(),
PE
.
Controllers
.
AddTable
||
{}))
});
\ No newline at end of file
apps/presentationeditor/mobile/app/template/AddTable.template
0 → 100644
View file @
25259f19
<!-- Root view -->
<div id="add-table-root">
<div class="page-content dataview table-styles">
<ul class="row">
<% _.each(styles, function(style) { %>
<li data-type="<%= style.templateId %>">
<img src="<%= style.imageUrl %>">
</li>
<% }); %>
</ul>
</div>
</div>
\ No newline at end of file
apps/presentationeditor/mobile/app/view/add/AddTable.js
0 → 100644
View file @
25259f19
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* AddTable.js
* Presentation Editor
*
* Created by Julia Radzhabova on 11/30/16
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
*
*/
define
([
'
text!presentationeditor/mobile/app/template/AddTable.template
'
,
'
jquery
'
,
'
underscore
'
,
'
backbone
'
],
function
(
addTemplate
,
$
,
_
,
Backbone
)
{
'
use strict
'
;
PE
.
Views
.
AddTable
=
Backbone
.
View
.
extend
(
_
.
extend
((
function
()
{
// private
return
{
// el: '.view-main',
template
:
_
.
template
(
addTemplate
),
events
:
{
},
initialize
:
function
()
{
Common
.
NotificationCenter
.
on
(
'
addcontainer:show
'
,
_
.
bind
(
this
.
initEvents
,
this
));
Common
.
NotificationCenter
.
on
(
'
tablestyles:load
'
,
_
.
bind
(
this
.
render
,
this
));
},
initEvents
:
function
()
{
var
me
=
this
;
me
.
initControls
();
},
// Render layout
render
:
function
()
{
this
.
layout
=
$
(
'
<div/>
'
).
append
(
this
.
template
({
android
:
Common
.
SharedSettings
.
get
(
'
android
'
),
phone
:
Common
.
SharedSettings
.
get
(
'
phone
'
),
styles
:
Common
.
SharedSettings
.
get
(
'
tablestyles
'
)
}));
var
$tableStyles
=
$
(
'
.table-styles
'
);
if
(
$tableStyles
)
{
$tableStyles
.
replaceWith
(
this
.
layout
.
find
(
'
#add-table-root
'
).
html
());
}
return
this
;
},
rootLayout
:
function
()
{
if
(
this
.
layout
)
{
return
this
.
layout
.
find
(
'
#add-table-root
'
)
.
html
();
}
return
''
;
},
initControls
:
function
()
{
//
}
}
})(),
PE
.
Views
.
AddTable
||
{}))
});
\ No newline at end of file
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