The last-editing-session could still be valid, but
waiting disconnection, in which case the kit might
have already discarded it, and so saving would
fail (silently, and thereby leaving docbroker
waiting for the save response).
To avoid this, we always validate the
last-editing-session before using, and not just
when setting it.
Change-Id: I60cd219d8e5a9945396110c8f8d194e87f81afba
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
(cherry picked from commit e1fc6adbfef7ee0678c7a563fd6142c32f2da4a6)
This log entry can be misleading on its own.
When shutting down, the modified flag is not reset,
and that in itself is not a cause for concern.
So this log entry is seen much more often than we
expect. If we truely fail to save/upload, there
will be other errors that will be the tell-tale
signs of a serious issue. So it's reasonable to
downgrade this error to a warning (and watch for
other errors).
Change-Id: Ic879c3fbac887ed5b64bdd1a31aa38bcfd863850
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
(cherry picked from commit 7db86b3eb2cdc2a44023e7b7491e1ee202146ef5)
When we are uploading before exit we don't
want the upload socket to linger, because
that would keep the SocketPoll alive for
longer than necessary, holding up the DocBroker.
Instead, we flag the socket for closure, right
after that single request, via HTTP headers.
This allows for very fast unloading of the
DocBroker right after uploading.
Change-Id: I926763383093d2d2dfb10ed41293b1f5d54d090b
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
(cherry picked from commit 4e132606d1849f82991c46d641c50794d632233c)
We need to make sure that the message slurping processes the events
first, because there could have been a message like "close: idle" from
the server.
Without the timeout, we'd immediately reconnect, because the
"close: idle" was not processed yet by the message slurping.
Co-author: Jan Holesovsky <kendy@collabora.com>
Change-Id: Id3e27164fb00de69f661ba7580075b36100a03c1
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
(cherry picked from commit e4d65426ee816d5b49f11b4ea5e7c49e464015a3)
Unloading duration depends on the time to save
and upload the document, during which a new view
might be opened. We now allow aborting the unloading
and resume reusing the document as-is.
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
(cherry picked from commit 8f299eb2cdfe0ef869a8c90fbc602a93ba2fcb73)
Change-Id: I7bc485177929c0d1c9ef12b02672db493ac402c9
Also, back-off the automatic load retrying exponentially.
It was 1s wait for 10 retries, now it's
.5, 2, 4.5, 8, 12.5, 18, 24.5, 32, 40.5 seconds, which
is more reasonable.
Change-Id: I7693b73327c5e09d7e90fd0cd0340fb9c14c3926
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
(cherry picked from commit f207df5f04f45060157dcc7e944f1e3bd53fcb8a)
E: loolwsd: binary-or-shlib-defines-rpath usr/bin/loolconvert /snap/loolwsd/current/usr/lib
E: loolwsd: binary-or-shlib-defines-rpath usr/bin/loolconvert /opt/poco/lib
These RPATHs are not needed when we statically link poco, as we do with production
packages.
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I5050fe1f1925937388793d443020fdc6a14ec97d
Also avoid using flex (so smartmenu
to show and hide can still work)
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I002b0fc9c5cc0a20f8fa4f0d72757c4b6ffd9697
And make sure to set h and v alignment
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I4d4efd179674200688b8b97bb19331a78bd1c393
undo and redo to be more consistent within the shortcutsbar
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Ic6323d87f9d9b9887b101579aa37af50283dd2f2
This allows for:
- Better alignments
- Consistent use of hue across all icons from within shortcutsbar
- Consistent style
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Ie659f91786c0e90813c5a234a0cb6f484313ab92
do not use floating point number for pixels (in the hopes of
avoiding changing too much the parent dimensions) instead,
use box-shadow.
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I64e567ad015c842cd42905587eecb6f4e793c753
- Not all elements were uniformly spaced out
- CSS was not targeting properly all elements
- Remove the need to add manually every element by id
every time we add a new one (or change it)
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I6de930e351822c3477c26c8e6569c41975cee142
... in order to avoid confusion. Binaries that Collabora compile, and
distribute are under a EULA. Source code is not.
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I34c7e089a100b43e6b9c69ee566736a9ae0cb93c
Display active annotation and do not overlap the remaining avatars
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Ie21d9b0f6abab8f5e19a2f2695f52f52750bf094
Make sure tooltips appear aligned to the right inside of its
container
note: changing overflow property on the element
.lokdialog.ui-dialog-content does not solve it properly without
sacrificing the vertical scrollbar (even when targeting
x y separately)
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Iae6212993332aac374e87f49e0a1ef2db4005593
- Change color depending on the doc type or default to one of
our grays (css var)
- Adjust reply count bubble position so it's more up right
- Change shadows depending on its state (open vs closed)
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Ief0d3e2b0f10d4c0b04993bb648e3e5642d1131e
Avoid adding draft reply to the commentList in comments list section.
This will prevent us from having draft and acctual comment in the list.
Only wait for a new comment ack from the server after replied.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I11cc7be90487ebe66d732d970a3e6612bf9a932d
New container which builds the same structure as mobile-wizard.
It will be used in case of smaller screens on desktop and tablets.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I4631750963bb7daec2659b7af021a4b7bc55f033
Don't move original annotation nodes in DOM tree.
Instead create new copy od comment widget to use
in mobile-wizard.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I53683055657a68e4729860341f84adc7fa582d92
It is possible to provide minimal size requirement for section.
When there is less space for a given section other sections
will be collapsed if canCollapse property is set.
As an exaple: tile section should have minimum 800 px
and we collapse comments section if needed.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Ie6f1a929834cf7275ca2e61d97be4292df01fa89
When we move marker we set IgnorePanning to true.
Unfortunately onUp handler is not called as Map.TouchGesture
overrides that event - so release variable there too.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I0e5a6bb05f54b12351a9deb770a052d7a0f89187
On mobile when keyboard is shown and user starts panning
keyboard shouldn't be hidden - it caused view to flicker
and keyboard was shown after short time again
Instead we want to keep keyboar with the same state as
before panning.
This change also fixes broken comparison between point and number
to detect map height resizing.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Ib7b1402f84d88a3a63ffa7e8314d5ec2dc1565ff
- we cannot get rid of UnitBase::get() which returns the last
set Unit class because we use it for example in WebSocketHandler
where we don't know which kind of test we run
- free memory correctly and reset global variables for subclasses
- setup _type member variable on construction
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Ic61b88785bff7de63b11ce2046eecc993c3ddeaf