Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE mobile] Fixed display chart styles.

Browse source
This commit is contained in:
Alexander Yuzhin 2016-11-24 12:03:41 +03:00
parent c106b6ec1d
commit 36a24ae366
7 changed files with 68 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/mobile/app/controller/edit/EditChart.js
View file

@ -42,8 +42,11 @@
define([
'core',
'documenteditor/mobile/app/view/edit/EditChart'
], function (core) {
'documenteditor/mobile/app/view/edit/EditChart',
'jquery',
'underscore',
'backbone'
], function (core, view, $, _, Backbone) {
'use strict';
DE.Controllers.EditChart = Backbone.Controller.extend(_.extend((function() {
@ -564,7 +567,7 @@ define([
Common.SharedSettings.set('chartstyles', styles);
Common.NotificationCenter.trigger('chartstyles:load', styles);
$('#tab-chart-style .dataview .row div').single('click', _.bind(this.onStyle, this));
$('#tab-chart-style li').single('click', _.bind(this.onStyle, this));
},
_uiTransformByWrap: function(type) {

12
apps/documenteditor/mobile/app/template/EditChart.template
View file

@ -317,16 +317,8 @@
</ul>
<% }); %>
</div>
<div id="tab-chart-style" class="page-content tab">
<div class="list-block">
<ul>
<li id="edit-chart-styles">
<div class="item-content">
<div class="item-inner"></div>
</div>
</li>
</ul>
</div>
<div id="tab-chart-style" class="page-content tab dataview chart-styles">
<!--Styles-->
</div>
<div id="tab-chart-fill" class="page-content tab">
<!--Fill colors-->

22
apps/documenteditor/mobile/app/view/edit/EditChart.js
View file

@ -178,10 +178,10 @@ define([
},
renderStyles: function() {
var $styleContainer = $('#edit-chart-styles .item-inner');
var $styleContainer = $('#tab-chart-style');
if ($styleContainer.length > 0) {
var columns = parseInt($styleContainer.width() / 60), // magic
var columns = parseInt($styleContainer.width() / 70), // magic
row = -1,
styles = [];
@ -194,17 +194,15 @@ define([
});
var template = _.template([
'<div class="dataview chart-styles" style="width: 100%;">',
'<% _.each(styles, function(row) { %>',
'<div class="row">',
'<% _.each(row, function(style) { %>',
'<div data-type="<%= style.asc_getStyle() %>">',
'<img src="<%= style.asc_getImageUrl() %>" width="50px" height="50px">',
'</div>',
'<% }); %>',
'</div>',
'<% _.each(styles, function(row) { %>',
'<ul class="row">',
'<% _.each(row, function(style) { %>',
'<li data-type="<%= style.asc_getStyle() %>">',
'<img src="<%= style.asc_getImageUrl() %>" width="50px" height="50px">',
'</li>',
'<% }); %>',
'</div>'
'</ul>',
'<% }); %>'
].join(''), {
styles: styles
});

9
apps/documenteditor/mobile/resources/css/app-ios.css
View file

@ -6619,6 +6619,15 @@ i.icon.icon-wrap-behind {
width: 70px;
height: 50px;
}
.chart-styles .row,
.chart-styles .row li {
margin-bottom: 12px;
}
.chart-styles li,
.chart-styles .row div {
margin: 0;
padding: 1px;
}
.shapes li {
width: 70px;
height: 70px;

9
apps/documenteditor/mobile/resources/css/app-material.css
View file

@ -6182,6 +6182,15 @@ textarea {
width: 70px;
height: 50px;
}
.chart-styles .row,
.chart-styles .row li {
margin-bottom: 12px;
}
.chart-styles li,
.chart-styles .row div {
margin: 0;
padding: 1px;
}
.shapes li {
width: 70px;
height: 70px;

16
apps/documenteditor/mobile/resources/less/app-ios.less
View file

@ -117,6 +117,22 @@ input, textarea {
}
}
// Chart styles
.chart-styles {
.row {
&, li {
margin-bottom: 12px;
}
}
li,
.row div {
margin: 0;
padding: 1px;
}
}
// Shapes
.shapes {

16
apps/documenteditor/mobile/resources/less/app-material.less
View file

@ -110,6 +110,22 @@ input, textarea {
}
}
// Chart styles
.chart-styles {
.row {
&, li {
margin-bottom: 12px;
}
}
li,
.row div {
margin: 0;
padding: 1px;
}
}
// Shapes
.shapes {