[DE mobile] Add merge cells in table options
This commit is contained in:
parent
9c4725cfd3
commit
3bd69c7d11
|
@ -236,6 +236,7 @@ define([
|
|||
$('#table-options-margins input').val(distance);
|
||||
$('#table-options-margins .item-after').text(distance + ' ' + _metricText);
|
||||
}
|
||||
$('#table-merge-cells').single('click', _.bind(this.onMergeCellClick, this));
|
||||
},
|
||||
|
||||
_initWrappView: function() {
|
||||
|
@ -614,6 +615,12 @@ define([
|
|||
me.api.tblApply(properties);
|
||||
},
|
||||
|
||||
onMergeCellClick: function () {
|
||||
if (this.api) {
|
||||
this.api.MergeCells();
|
||||
}
|
||||
},
|
||||
|
||||
onBorderSize: function (e) {
|
||||
var $target = $(e.currentTarget),
|
||||
value = $target.val();
|
||||
|
|
|
@ -220,6 +220,17 @@
|
|||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="list-block" style="margin-bottom: 40px;">
|
||||
<ul>
|
||||
<a id="table-merge-cells" class="item-link no-indicator">
|
||||
<div class="item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textMergeCells %></div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -242,7 +242,8 @@ define([
|
|||
textBandedRow: 'Banded Row',
|
||||
textFirstColumn: 'First Column',
|
||||
textLastColumn: 'Last Column',
|
||||
textBandedColumn: 'Banded Column'
|
||||
textBandedColumn: 'Banded Column',
|
||||
textMergeCells: 'Merge Cells'
|
||||
}
|
||||
})(), DE.Views.EditTable || {}))
|
||||
});
|
|
@ -338,6 +338,7 @@
|
|||
"DE.Views.EditTable.textTotalRow": "Total Row",
|
||||
"DE.Views.EditTable.textWithText": "Move with Text",
|
||||
"DE.Views.EditTable.textWrap": "Wrap",
|
||||
"DE.Views.EditTable.textMergeCells": "Merge Cells",
|
||||
"DE.Views.EditText.textAdditional": "Additional",
|
||||
"DE.Views.EditText.textAdditionalFormat": "Additional Formatting",
|
||||
"DE.Views.EditText.textAllCaps": "All Caps",
|
||||
|
|
Loading…
Reference in a new issue