Skip to content

W
web-apps
Commit a1009bef authored by Alexander Yuzhin's avatar Alexander Yuzhin
Browse files
Options

Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile

parents b0e63513 dc152bda
Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 110 deletions
apps/spreadsheeteditor/mobile/app-dev.js
View file @ a1009bef
......@@ -119,8 +119,8 @@ require([
'Search',
'Main',
'DocumentHolder'
, 'CellEditor'
, 'Statusbar'
,'CellEditor'
,'Statusbar'
,'Settings'
,'EditContainer'
,'EditCell'
......@@ -131,7 +131,7 @@ require([
,'EditChart'
// ,'EditHyperlink'
,'AddContainer'
// ,'AddTable'
,'AddChart'
,'AddShape'
// ,'AddImage'
,'AddOther'
......@@ -189,10 +189,10 @@ require([
'spreadsheeteditor/mobile/app/controller/Search',
'spreadsheeteditor/mobile/app/controller/Main',
'spreadsheeteditor/mobile/app/controller/DocumentHolder'
, 'spreadsheeteditor/mobile/app/controller/CellEditor'
, 'spreadsheeteditor/mobile/app/controller/Statusbar'
, 'spreadsheeteditor/mobile/app/controller/Settings'
, 'spreadsheeteditor/mobile/app/controller/edit/EditContainer'
,'spreadsheeteditor/mobile/app/controller/CellEditor'
,'spreadsheeteditor/mobile/app/controller/Statusbar'
,'spreadsheeteditor/mobile/app/controller/Settings'
,'spreadsheeteditor/mobile/app/controller/edit/EditContainer'
,'spreadsheeteditor/mobile/app/controller/edit/EditCell'
// ,'spreadsheeteditor/mobile/app/controller/edit/EditParagraph'
// ,'spreadsheeteditor/mobile/app/controller/edit/EditTable'
......@@ -201,7 +201,7 @@ require([
,'spreadsheeteditor/mobile/app/controller/edit/EditChart'
// ,'spreadsheeteditor/mobile/app/controller/edit/EditHyperlink'
,'spreadsheeteditor/mobile/app/controller/add/AddContainer'
// ,'spreadsheeteditor/mobile/app/controller/add/AddTable'
,'spreadsheeteditor/mobile/app/controller/add/AddChart'
,'spreadsheeteditor/mobile/app/controller/add/AddShape'
// ,'spreadsheeteditor/mobile/app/controller/add/AddImage'
,'spreadsheeteditor/mobile/app/controller/add/AddOther'
......
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file @ a1009bef
......@@ -33,7 +33,6 @@
/**
* DocumentHolder.js
* Document Editor
*
* Created by Maxim Kadushkin on 11/15/16
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
......
apps/spreadsheeteditor/mobile/app/controller/Editor.js
View file @ a1009bef
......@@ -33,7 +33,6 @@
/**
* Editor.js
* Document Editor
*
* Created by Maxim Kadushkin on 11/15/16
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
......
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file @ a1009bef
......@@ -33,7 +33,6 @@
/**
* Main.js
* Document Editor
*
* Created by Maxim Kadushkin on 11/15/16
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
......@@ -98,7 +97,7 @@ define([
me.api = new Asc.spreadsheet_api({
'id-view' : 'editor_sdk',
'id-input' : 'ce-cell-content'
,'mobile' : true
// ,'mobile' : true
});
if (me.api){
......@@ -1437,7 +1436,7 @@ define([
},
leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.',
defaultTitleText: 'ONLYOFFICE Document Editor',
defaultTitleText: 'ONLYOFFICE Spreadsheet Editor',
criticalErrorTitle: 'Error',
notcriticalErrorTitle: 'Warning',
errorDefaultMessage: 'Error code: %1',
......
apps/spreadsheeteditor/mobile/app/controller/Settings.js
View file @ a1009bef
......@@ -33,7 +33,6 @@
/**
* Settings.js
* Document Editor
*
* Created by Maxim Kadushkin on 12/05/2016
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
......
apps/spreadsheeteditor/mobile/app/controller/add/AddChart.js 0 → 100644
View file @ a1009bef
/*
*
* (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
*
* Created by Maxim Kadushkin on 12/13/2016
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
*
*/
define([
'core',
'spreadsheeteditor/mobile/app/view/add/AddChart'
], function (core) {
'use strict';
SSE.Controllers.AddChart = Backbone.Controller.extend(_.extend((function() {
return {
models: [],
collections: [],
views: [
'AddChart'
],
initialize: function () {
Common.NotificationCenter.on('addcontainer:show', _.bind(this.initEvents, this));
this.addListeners({
'AddChart': {
'chart:insert': this.onInsertChart.bind(this)
}
});
},
setApi: function (api) {
var me = this;
me.api = api;
},
onLaunch: function () {
this.createView('AddChart').render();
},
initEvents: function () {
},
onInsertChart: function (type) {
SSE.getController('AddContainer').hideModal();
var settings = this.api.asc_getChartObject();
settings.changeType(type);
this.api.asc_addChartDrawingObject(settings);
},
}
})(), SSE.Controllers.AddChart || {}))
});
\ No newline at end of file
apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js
View file @ a1009bef
......@@ -109,7 +109,7 @@ define([
addViews.push({
caption: me.textChart,
id: 'add-chart',
layout: me._dummyEditController().getLayout()
layout: SSE.getController('AddChart').getView('AddChart').rootLayout()
});
addViews.push({
......
apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
View file @ a1009bef
......@@ -32,7 +32,6 @@
*/
/**
* AddOther.js
* Document Editor
*
* Created by Kadushkin Maxim on 12/07/2016
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
......@@ -67,8 +66,8 @@ define([
this.addListeners({
'AddOther': {
'page:show' : this.onPageShow
, 'insert:link': this.onInsertLink
, 'insert:image': this.onInsertImage
, 'link:insert': this.onInsertLink
, 'image:insert': this.onInsertImage
}
});
},
......
apps/spreadsheeteditor/mobile/app/controller/add/AddShape.js
View file @ a1009bef
......@@ -33,7 +33,6 @@
/**
* AddShape.js
* Document Editor
*
* Created by Maxim Kadushkin on 12/07/2016
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
......@@ -215,7 +214,7 @@ define([
var $target = $(e.currentTarget);
if ($target && this.api) {
this.api.addShapeOnSheet($target.data('type'));
this.api.asc_addShapeOnSheet($target.data('type'));
}
SSE.getController('AddContainer').hideModal();
......
apps/spreadsheeteditor/mobile/app/template/AddChart.template 0 → 100644
View file @ a1009bef
<!-- Root view -->
<div id="add-chart-root">
<div class="page-content dataview chart-types">
<% _.each(types, function(row) { %>
<ul class="row">
<% _.each(row, function(type) { %>
<li data-type="<%= type.type %>">
<div class="thumb <%= type.thumb %>"></div>
</li>
<% }); %>
</ul>
<% }); %>
</div>
</div>
\ No newline at end of file
apps/spreadsheeteditor/mobile/app/template/AddImage.template deleted 100644 → 0
View file @ b0e63513
<!-- Root view -->
<div id="addimage-root-view">
<div class="list-block">
<ul>
<li>
<a id="add-image-file" class="item-link no-indicator">
<div class="item-content">
<div class="item-media">
<i class="icon icon-search"></i>
</div>
<div class="item-inner">
<div class="item-title">Picture from Library</div>
</div>
</div>
</a>
</li>
<li>
<a id="add-image-url" class="item-link">
<div class="item-content">
<div class="item-media">
<i class="icon icon-link"></i>
</div>
<div class="item-inner">
<div class="item-title">Picture from URL</div>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
<!-- Url view -->
<div id="addimage-url-view">
<div class="navbar">
<div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span>Back</span><% } %></a></div>
<div class="center sliding">Link Settings</div>
</div>
</div>
<div class="page" id="addimage-url">
<div class="page-content">
<div class="content-block-title">Address</div>
<div class="list-block">
<ul>
<li>
<div id="addimage-link-url" class="item-content">
<div class="item-inner">
<div class="item-input">
<input type="url" placeholder="Image URL">
</div>
</div>
</div>
</li>
</ul>
</div>
<div class="list-block disabled" id="addimage-insert">
<% if (android) { %>
<a href="#" class="button button-fill button-raised" style="margin: 20px 16px;">Insert Image</a>
<% } else { %>
<ul>
<li>
<a href="#" class="list-button item-link">Insert Image</a>
</li>
</ul>
<% } %>
</div>
</div>
</div>
</div>
\ No newline at end of file
apps/spreadsheeteditor/mobile/app/template/AddTable.template deleted 100644 → 0
View file @ b0e63513
<!-- 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/spreadsheeteditor/mobile/app/view/DocumentHolder.js
View file @ a1009bef
......@@ -33,7 +33,6 @@
/**
* DocumentHolder.js
* Document Editor
*
* Created by Maxim Kadushkin on 11/8/16
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
......
apps/spreadsheeteditor/mobile/app/view/Editor.js
View file @ a1009bef
......@@ -33,7 +33,6 @@
/**
* Editor.js
* Document Editor
*
* Created by Maxim Kadushkin on 11/15/16
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
......
apps/spreadsheeteditor/mobile/app/view/Settings.js
View file @ a1009bef
......@@ -33,7 +33,6 @@
/**
* Settings.js
* Document Editor
*
* Created by Maxim Kadushkin on 12/05/2016
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
......
apps/spreadsheeteditor/mobile/app/view/add/AddChart.js 0 → 100644
View file @ a1009bef
/*
*
* (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
*
*/
/**
* AddChart.js
*
* Created by Maxim Kadushkin on 12/13/2016
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
*
*/
define([
'text!spreadsheeteditor/mobile/app/template/AddChart.template',
'backbone'
], function (addTemplate, Backbone) {
'use strict';
SSE.Views.AddChart = Backbone.View.extend(_.extend((function() {
// private
var _types = [
{ type: Asc.c_oAscChartTypeSettings.barNormal, thumb: 'bar-normal'},
{ type: Asc.c_oAscChartTypeSettings.barStacked, thumb: 'bar-stacked'},
{ type: Asc.c_oAscChartTypeSettings.barStackedPer, thumb: 'bar-pstacked'},
{ type: Asc.c_oAscChartTypeSettings.lineNormal, thumb: 'line-normal'},
{ type: Asc.c_oAscChartTypeSettings.lineStacked, thumb: 'line-stacked'},
{ type: Asc.c_oAscChartTypeSettings.lineStackedPer, thumb: 'line-pstacked'},
{ type: Asc.c_oAscChartTypeSettings.hBarNormal, thumb: 'hbar-normal'},
{ type: Asc.c_oAscChartTypeSettings.hBarStacked, thumb: 'hbar-stacked'},
{ type: Asc.c_oAscChartTypeSettings.hBarStackedPer, thumb: 'hbar-pstacked'},
{ type: Asc.c_oAscChartTypeSettings.areaNormal, thumb: 'area-normal'},
{ type: Asc.c_oAscChartTypeSettings.areaStacked, thumb: 'area-stacked'},
{ type: Asc.c_oAscChartTypeSettings.areaStackedPer, thumb: 'area-pstacked'},
{ type: Asc.c_oAscChartTypeSettings.pie, thumb: 'pie'},
{ type: Asc.c_oAscChartTypeSettings.doughnut, thumb: 'doughnut'},
{ type: Asc.c_oAscChartTypeSettings.pie3d, thumb: 'pie3d'},
{ type: Asc.c_oAscChartTypeSettings.scatter, thumb: 'scatter'},
{ type: Asc.c_oAscChartTypeSettings.stock, thumb: 'stock'},
{ type: Asc.c_oAscChartTypeSettings.line3d, thumb: 'line3d'},
{ type: Asc.c_oAscChartTypeSettings.barNormal3d, thumb: 'bar3dnormal'},
{ type: Asc.c_oAscChartTypeSettings.barStacked3d, thumb: 'bar3dstack'},
{ type: Asc.c_oAscChartTypeSettings.barStackedPer3d, thumb: 'bar3dpstack'},
{ type: Asc.c_oAscChartTypeSettings.hBarNormal3d, thumb: 'hbar3dnormal'},
{ type: Asc.c_oAscChartTypeSettings.hBarStacked3d, thumb: 'hbar3dstack'},
{ type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, thumb: 'hbar3dpstack'},
{ type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, thumb: 'bar3dpsnormal'}
];
return {
// el: '.view-main',
template: _.template(addTemplate),
events: {
},
initialize: function () {
Common.NotificationCenter.on('addcontainer:show', _.bind(this.initEvents, this));
},
initEvents: function () {
var me = this;
$('.chart-types .thumb').single('click', this.onTypeClick.bind(this));
me.initControls();
},
// Render layout
render: function () {
var elementsInRow = 3;
var groupsOfTypes = _.chain(_types).groupBy(function(element, index){
return Math.floor(index/elementsInRow);
}).toArray().value();
this.layout = $('<div/>').append(this.template({
android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'),
types : groupsOfTypes
}));
var $chartStyles = $('.container-add .chart-styles');
if ( $chartStyles ) {
$chartStyles.replaceWith(this.layout.find('#add-chart-root').html());
}
return this;
},
rootLayout: function () {
if (this.layout) {
return this.layout.html();
}
return '';
},
initControls: function () {
//
},
onTypeClick: function (e) {
this.fireEvent('chart:insert', [$(e.target.parentElement).data('type')]);
}
}
})(), SSE.Views.AddChart || {}))
});
\ No newline at end of file
apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
View file @ a1009bef
......@@ -33,7 +33,6 @@
/**
* AddOther.js
* Document Editor
*
* Created by Kadushkin Maxim on 12/07/2016
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
......@@ -118,7 +117,7 @@ define([
$('#addimage-url').single('click', this.showImageFromUrl.bind(this));
$('#addimage-file').single('click', function () {
this.fireEvent('insert:image',[{islocal:true}]);
this.fireEvent('image:insert',[{islocal:true}]);
}.bind(this));
},
......@@ -141,7 +140,7 @@ define([
display = $('#add-link-display input').val(),
tip = $('#add-link-tip input').val();
this.fireEvent('insert:link', [{url:url, text:display, tooltip:tip}]);
this.fireEvent('link:insert', [{url:url, text:display, tooltip:tip}]);
},
showImageFromUrl: function () {
......@@ -152,7 +151,7 @@ define([
$('#addimage-insert a').single('click', _.buffered(function () {
var value = ($input.val()).replace(/ /g, '');
me.fireEvent('insert:image', [{islocal:false, url:value}]);
me.fireEvent('image:insert', [{islocal:false, url:value}]);
}, 100, me));
var $btnInsert = $('#addimage-insert');
......
apps/spreadsheeteditor/mobile/app/view/add/AddShape.js
View file @ a1009bef
......@@ -33,7 +33,6 @@
/**
* AddShape.js
* Document Editor
*
* Created by Maxim Kadushkin on 12/07/2016
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
......
apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
View file @ a1009bef
......@@ -164,4 +164,82 @@ i.icon {
height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{themeColor}"><g><path opacity="0.3" d="M1,1V13H13V1H1ZM12,12H2V2H12V12Z"/><path opacity="0.3" d="M15,15V27H27V15H15ZM26,26H16V16H26V26Z"/><rect x="8" y="8" width="13" height="13"/></g></svg>');
}
}
.chart-types .thumb {
&.bar-normal {
background-image: data-uri('../img/charts/chart-03.png');
}
&.bar-stacked {
background-image: data-uri('../img/charts/chart-02.png');
}
&.bar-pstacked {
background-image: data-uri('../img/charts/chart-01.png');
}
&.line-normal {
background-image: data-uri('../img/charts/chart-06.png');
}
&.line-stacked {
background-image: data-uri('../img/charts/chart-05.png');
}
&.line-pstacked {
background-image: data-uri('../img/charts/chart-04.png');
}
&.hbar-normal {
background-image: data-uri('../img/charts/chart-09.png');
}
&.hbar-stacked {
background-image: data-uri('../img/charts/chart-08.png');
}
&.hbar-pstacked {
background-image: data-uri('../img/charts/chart-07.png');
}
&.area-normal {
background-image: data-uri('../img/charts/chart-12.png');
}
&.area-stacked {
background-image: data-uri('../img/charts/chart-11.png');
}
&.area-pstacked {
background-image: data-uri('../img/charts/chart-10.png');
}
&.pie {
background-image: data-uri('../img/charts/chart-13.png');
}
&.doughnut {
background-image: data-uri('../img/charts/chart-14.png');
}
&.pie3d {
background-image: data-uri('../img/charts/chart-22.png');
}
&.scatter {
background-image: data-uri('../img/charts/chart-15.png');
}
&.stock {
background-image: data-uri('../img/charts/chart-16.png');
}
&.line3d {
background-image: data-uri('../img/charts/chart-21.png');
}
&.bar3dnormal {
background-image: data-uri('../img/charts/chart-17.png');
}
&.bar3dstack {
background-image: data-uri('../img/charts/chart-18.png');
}
&.bar3dpstack {
background-image: data-uri('../img/charts/chart-19.png');
}
&.hbar3dnormal {
background-image: data-uri('../img/charts/chart-25.png');
}
&.hbar3dstack {
background-image: data-uri('../img/charts/chart-24.png');
}
&.hbar3dpstack {
background-image: data-uri('../img/charts/chart-23.png');
}
&.bar3dpsnormal {
background-image: data-uri('../img/charts/chart-20.png');
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7