summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2016-09-01 17:20:14 +0200
committerAndras Timar <andras.timar@collabora.com>2016-09-16 21:13:09 +0200
commitd2b7d6a178f7654c29712370a9d47c1bd22df6d0 (patch)
tree2a8c61fbc782d8e70c80430ba2d0d4510644a413
parentf304efaaeb6b25fdaf2e792c36540f76f6b4d800 (diff)
Revert "Add footnote and text wrap functions"private/Ashod/tilecombine
-rw-r--r--loleaflet/dist/images/lc_insertfootnote.pngbin140 -> 0 bytes
-rw-r--r--loleaflet/dist/toolbar.css1
-rw-r--r--loleaflet/dist/toolbar/toolbar.js16
3 files changed, 0 insertions, 17 deletions
diff --git a/loleaflet/dist/images/lc_insertfootnote.png b/loleaflet/dist/images/lc_insertfootnote.png
deleted file mode 100644
index 65b110fe1..000000000
--- a/loleaflet/dist/images/lc_insertfootnote.png
+++ /dev/null
Binary files differ
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index aef6e2319..40f53f531 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -246,7 +246,6 @@ button.leaflet-control-search-next
.w2ui-icon.save{ background: url('/loleaflet/dist/images/lc_save.png') no-repeat center !important; }
.w2ui-icon.saveas{ background: url('/loleaflet/dist/images/lc_saveas.png') no-repeat center !important; }
.w2ui-icon.strikeout{ background: url('/loleaflet/dist/images/lc_strikeout.png') no-repeat center !important; }
-.w2ui-icon.insertfootnote{ background: url('/loleaflet/dist/images/lc_insertfootnote.png') no-repeat center !important; }
.w2ui-icon.underline{ background: url('/loleaflet/dist/images/lc_underline.png') no-repeat center !important; }
.w2ui-icon.undo{ background: url('/loleaflet/dist/images/lc_undo.png') no-repeat center !important; }
.w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/plus.png') no-repeat center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index f6597f26f..218bb4640 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -171,11 +171,6 @@ function onClick(id, item, subItem) {
else if (id === 'lastrecord') {
$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth'));
}
- else if (id.startsWith('menu:wrap:wrap-'))
- {
- var wrapType = id.substring('menu:wrap:wrap-'.length);
- map.toggleCommandState(wrapType);
- }
else if (id === 'insertgraphic') {
L.DomUtil.get('insertgraphic').click();
}
@@ -334,15 +329,6 @@ $(function () {
name: 'toolbar-up',
items: [
{type: 'html', id: 'left'},
- {type: 'menu', id: 'writer:menu:wrap', caption: _('Textwrap'), items: [
- { text: _('No wrap'), id: 'wrap-WrapOff' },
- { text: _('Page wrap'), id: 'wrap-WrapOn' },
- { text: _('Wrap anchor only'), id: 'wrap-WrapAnchorOnly' },
- { text: _('Ideal wrap'), id: 'wrap-WrapIdeal' },
- { text: _('Left wrap'), id: 'wrap-WrapLeft' },
- { text: _('Right wrap'), id: 'wrap-WrapRight' },
- { text: _('Wrap through'), id: 'wrap-WrapThrough' }
- ]},
{type: 'button', id: 'save', img: 'save', hint: _('Save'), uno: 'Save'},
{type: 'break'},
{type: 'button', id: 'undo', img: 'undo', hint: _('Undo'), uno: 'Undo'},
@@ -358,8 +344,6 @@ $(function () {
{type: 'button', id: 'underline', img: 'underline', hint: _('Underline'), uno: 'Underline'},
{type: 'button', id: 'strikeout', img: 'strikeout', hint: _('Strikeout'), uno: 'Strikeout'},
{type: 'break'},
- {type: 'button', id: 'insertfootnote', img: 'insertfootnote', hint: _('Insert Footnote'), uno: 'InsertFootnote' },
- {type: 'break' },
{type: 'html', id: 'fontcolor-html', html: '<input id="fontColorPicker" style="display:none;">'},
{type: 'button', id: 'fontcolor', img: 'color', hint: _('Font color')},
{type: 'html', id: 'backcolor-html', html: '<input id="backColorPicker" style="display:none;">'},