[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-4' - 6 commits - loleaflet/Makefile loleaflet/src loolwsd/configure.ac loolwsd/LOOLSession.cpp
Andras Timar
andras.timar at collabora.com
Fri Aug 28 01:24:36 PDT 2015
loleaflet/Makefile | 2 +-
loleaflet/src/control/Control.PartsPreview.js | 7 +++++++
loleaflet/src/layer/tile/TileLayer.js | 6 ++++++
loolwsd/LOOLSession.cpp | 3 ---
loolwsd/configure.ac | 2 +-
5 files changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 14de08084f55f5c64c411538656ddfc4e50370e6
Author: Andras Timar <andras.timar at collabora.com>
Date: Fri Aug 28 10:24:14 2015 +0200
loleaflet: bump version after tarball
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 836e7ec..aa5021a 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.1.36
+VERSION=1.1.37
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
commit 0a842c5c5d6b014f7a62bf642bf15fa1b3d967c1
Author: Andras Timar <andras.timar at collabora.com>
Date: Fri Aug 28 10:24:03 2015 +0200
loleaflet: bump version before tarball
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index ec025f5..836e7ec 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.1.35
+VERSION=1.1.36
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
commit a80b4aaeda42ac3494d63de5a1c83b3cf33853c4
Author: Andras Timar <andras.timar at collabora.com>
Date: Fri Aug 28 10:23:16 2015 +0200
loolwsd: bump version after tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 907966e..d272fff 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.2.14], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.2.15], [libreoffice at collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 8be3a8538e76d00262ca0bbeabca68c8684cbca9
Author: Andras Timar <andras.timar at collabora.com>
Date: Fri Aug 28 10:22:36 2015 +0200
loolwsd: bump version before tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 07db4eb..907966e 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.2.13], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.2.14], [libreoffice at collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 458f91e8a379b8f14373a6d8e3c63af4a0e127cf
Author: Henry Castro <hcastro at collabora.com>
Date: Fri Aug 28 01:40:55 2015 -0400
loleaflet: update images loaded asynchronously
(cherry picked from commit 0dc7dca0df8c3550b3adba608e64692a461bcabe)
diff --git a/loleaflet/src/control/Control.PartsPreview.js b/loleaflet/src/control/Control.PartsPreview.js
index 4556111..b09e446 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -10,6 +10,7 @@ L.Control.PartsPreview = L.Control.extend({
this._partsPreviewCont = L.DomUtil.create('div', 'parts-preview', docContainer.parentElement);
map.on('updateparts', this._updateDisabled, this);
+ map.on('updatepart', this._updatePart, this);
map.on('tilepreview', this._updatePreview, this);
return document.createElement('div');
},
@@ -54,6 +55,12 @@ L.Control.PartsPreview = L.Control.extend({
}
},
+ _updatePart: function (e) {
+ if (e.docType === 'presentation') {
+ this._map.getPartPreview(e.part, e.part, 180, 180);
+ }
+ },
+
_updatePreview: function (e) {
var id = 'preview-tile' + e.id;
// the scrollbar has to be re-initialized here else it doesn't work
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 833a252..afa9c05 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -68,6 +68,7 @@ L.TileLayer = L.GridLayer.extend({
// Position and size of the selection end.
this._textSelectionEnd = new L.LatLngBounds(new L.LatLng(0, 0), new L.LatLng(0, 0));
+ this._lastValidPart = -1;
// Cursor marker
this._cursorMarker = null;
// Graphic marker
@@ -340,6 +341,11 @@ L.TileLayer = L.GridLayer.extend({
delete this._tileCache[key];
}
}
+ if ( command.part === this._currentPart &&
+ command.part !== this._lastValidPart ) {
+ this._lastValidPart = command.part;
+ this._map.fire('updatepart', { part: command.part, docType: this._docType });
+ }
}
else if (textMsg.startsWith('statechanged:')) {
var unoMsg = textMsg.substr(14);
commit 56b09ae8067d26b8ec309f71cc0715088ea55f61
Author: Henry Castro <hcastro at collabora.com>
Date: Fri Aug 28 01:28:14 2015 -0400
loolwsd: revert update status when switching parts
(cherry picked from commit 0c6c2c8da2dfa0acfc2816518982417896818779)
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 2545134..5608aec 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -619,7 +619,6 @@ bool ChildProcessSession::handleInput(const char *buffer, int length)
if (_docType != "text" && _loKitDocument->pClass->getPart(_loKitDocument) != _clientPart)
{
_loKitDocument->pClass->setPart(_loKitDocument, _clientPart);
- getStatus("", 0);
}
if (tokens[0] == "gettextselection")
{
@@ -862,7 +861,6 @@ void ChildProcessSession::sendTile(const char *buffer, int length, StringTokeniz
unsigned char *pixmap = new unsigned char[4 * width * height];
if (_docType != "text" && part != _loKitDocument->pClass->getPart(_loKitDocument)) {
_loKitDocument->pClass->setPart(_loKitDocument, part);
- getStatus("", 0);
}
_loKitDocument->pClass->paintTile(_loKitDocument, pixmap, width, height, tilePosX, tilePosY, tileWidth, tileHeight);
@@ -1059,7 +1057,6 @@ bool ChildProcessSession::setPage(const char *buffer, int length, StringTokenize
return false;
}
_loKitDocument->pClass->setPart(_loKitDocument, page);
- getStatus("", 0);
return true;
}
More information about the Libreoffice-commits
mailing list