[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - 4 commits - configure.ac loleaflet/dist loleaflet/src
Andras Timar
andras.timar at collabora.com
Mon Mar 27 13:48:16 UTC 2017
configure.ac | 2 -
loleaflet/dist/images/lc_insertfootnote.svg | 1
loleaflet/dist/toolbar.css | 1
loleaflet/dist/toolbar/toolbar.js | 17 ---------------
loleaflet/src/map/handler/Map.Scroll.js | 30 ----------------------------
5 files changed, 3 insertions(+), 48 deletions(-)
New commits:
commit 0a672146505a6c02c5e58a88a2c8c60808c4eb02
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Mar 27 15:47:51 2017 +0200
Bump version to 2.1.0
Change-Id: Id5528805a1726de6cb58e9644a8cdd48cc281c1f
diff --git a/configure.ac b/configure.ac
index d89845da..1f6cad77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [master], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [2.1.0], [libreoffice at lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects tar-pax])
commit 75133f5170fac14e55bf66b245cc9678b09210f2
Author: Pranav Kant <pranavk at collabora.co.uk>
Date: Tue Nov 15 18:16:08 2016 +0530
tdf#103641: Hide redundant break after save too
... if save button is hidden. This is not the case in master
as we have additional element, Textwrap, there.
(cherry picked from commit 1113debc2ff73cf4bebd751a8f97cef050b0f286)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 949e9163..50492a19 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -924,6 +924,7 @@ map.on('showbusy', function(e) {
map.on('wopiprops', function(e) {
if (e.HideSaveOption) {
w2ui['toolbar-up'].hide('save');
+ w2ui['toolbar-up'].hide('savebreak');
}
});
commit d03bdb8736ded8b84c9d6a3e832388cb349b9f1a
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Mar 27 15:46:14 2017 +0200
Revert "Add footnote and text wrap functions"
Change-Id: I59d374d3f8bdfa6a3b871bdec5389a53bb3a9da9
diff --git a/loleaflet/dist/images/lc_insertfootnote.svg b/loleaflet/dist/images/lc_insertfootnote.svg
deleted file mode 100644
index 9907b8b3..00000000
--- a/loleaflet/dist/images/lc_insertfootnote.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><g transform="translate(1 -1029.3622)"><path d="m5 4v16h1 6v-1h-6v-14h12v8h1v-9h-1-12zm2 3v1h10v-1zm0 2v1h6v-1zm0 5v1h7v-1z" fill="#4d4d4d" transform="translate(-1 1029.3622)"/><path d="m16 1043.3622l-1 2h1v4h1v-6z" fill="#1d99f3"/><path d="m6 1045.3622h7v1.0000348h-7z" fill="#1d99f3"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 8e5f8308..220f4f94 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -231,7 +231,6 @@ button.leaflet-control-search-next
.w2ui-icon.save{ background: url('../images/lc_save.svg') no-repeat center !important; }
.w2ui-icon.saveas{ background: url('../images/lc_saveas.svg') no-repeat center !important; }
.w2ui-icon.strikeout{ background: url('../images/lc_strikeout.svg') no-repeat center !important; }
-.w2ui-icon.insertfootnote{ background: url('../images/lc_insertfootnote.svg') no-repeat center !important; }
.w2ui-icon.underline{ background: url('../images/lc_underline.svg') no-repeat center !important; }
.w2ui-icon.undo{ background: url('../images/lc_undo.svg') no-repeat center !important; }
.w2ui-icon.zoomin{ background: url('../images/plus.svg') no-repeat center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 6bbd3439..949e9163 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -278,11 +278,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();
}
@@ -461,15 +456,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', id: 'savebreak'},
{type: 'button', id: 'undo', img: 'undo', hint: _('Undo'), uno: 'Undo'},
@@ -485,8 +471,6 @@ $(function () {
{type: 'button', id: 'underline', img: 'underline', hint: _('Underline'), uno: 'Underline'},
{type: 'button', id: 'strikeout', img: 'strikeout', hint: _('Strikeout'), uno: 'Strikeout'},
{type: 'break', id: 'formatbreak'},
- {type: 'button', id: 'insertfootnote', img: 'insertfootnote', hint: _('Insert Footnote'), uno: 'InsertFootnote' },
- {type: 'break' },
{type: 'html', id: 'fontcolor-html', html: '<div id="fontcolor-wrapper"><input id="fontColorPicker" style="display:none;"></div>'},
{type: 'button', id: 'fontcolor', img: 'color', hint: _('Font color')},
{type: 'html', id: 'backcolor-html', html: '<div id="backcolor-wrapper"><input id="backColorPicker" style="display:none;"></div>'},
commit d63ef319575c4ed508d3abb8c850d9c7654db8d5
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Mar 27 15:36:12 2017 +0200
Revert "implemented zooming with Ctrl-<mousewheel>"
This reverts commit a3c1a685cd4107f229b97619bcce9a3646fc7730.
diff --git a/loleaflet/src/map/handler/Map.Scroll.js b/loleaflet/src/map/handler/Map.Scroll.js
index 593e1dfb..f7a98f3c 100644
--- a/loleaflet/src/map/handler/Map.Scroll.js
+++ b/loleaflet/src/map/handler/Map.Scroll.js
@@ -38,12 +38,7 @@ L.Map.Scroll = L.Handler.extend({
var left = Math.max(debounce - (+new Date() - this._startTime), 0);
clearTimeout(this._timer);
- if (e.ctrlKey) {
- this._timer = setTimeout(L.bind(this._performZoom, this), left);
- }
- else {
- this._timer = setTimeout(L.bind(this._performScroll, this), left);
- }
+ this._timer = setTimeout(L.bind(this._performScroll, this), left);
L.DomEvent.stop(e);
},
@@ -58,29 +53,6 @@ L.Map.Scroll = L.Handler.extend({
if (!delta) { return; }
map.fire('scrollby', {x: 0, y: delta * scrollAmount});
- },
-
- _performZoom: function () {
- var map = this._map,
- delta = this._delta,
- zoom = map.getZoom();
-
- map.stop(); // stop panning and fly animations if any
-
- delta = delta > 0 ? Math.ceil(delta) : Math.floor(delta);
- delta = Math.max(Math.min(delta, 4), -4);
- delta = map._limitZoom(zoom + delta) - zoom;
-
- this._delta = 0;
- this._startTime = null;
-
- if (!delta) { return; }
-
- if (map.options.scrollWheelZoom === 'center') {
- map.setZoom(zoom + delta);
- } else {
- map.setZoomAround(this._lastMousePos, zoom + delta);
- }
}
});
More information about the Libreoffice-commits
mailing list