Commit graph

2017 commits

Author SHA1 Message Date
Aron Budea
61acc4ae7d loleaflet: enable horizontal scrolling via Shift + mousewheel
Change-Id: I3cac65248628042e0150e9f393c89e4fbefb8ed6
Reviewed-on: https://gerrit.libreoffice.org/41088
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-09-21 15:46:28 +02:00
Andras Timar
b8a50e6750 loleaflet: updated UI pot file
Change-Id: I4de681eded5a1839928935be4b3d94dfa90a0efe
2017-09-20 12:12:49 +02:00
Henry Castro
0d870d444c loleaflet: fix background color of the top level menu items
Change-Id: I548c700a16664e8acfc6010c1be549e6176f2383
2017-09-19 21:46:09 -04:00
Pranav Kant
fcffb01725 Don't forget reconnecting the socket in these cases
This regressed with 7c1e1120c6

Calling .initialize() on socket object is not enough anymore after above
mentioned commit; it doesn't re-establish the socket connection as
was the intent earlier in following cases.

Change-Id: Icd0a87a875eb275ed3c914474cdc502b460e2d16
Reviewed-on: https://gerrit.libreoffice.org/42431
Reviewed-by: Henry Castro <hcastro@collabora.com>
Tested-by: Henry Castro <hcastro@collabora.com>
2017-09-18 20:17:50 +02:00
Henry Castro
1a493880a4 loleaflet: show error when the document is disconnected
Change-Id: I43f8d48002ccb2fc3b6ac9807b72ba6b618d72d2
2017-09-17 11:09:02 -04:00
Henry Castro
0cdf361510 loleaflet: clean up the socket connection
Change-Id: I29861d74ba5e0aa789eec41fb353aca1dad6cce4
2017-09-17 10:45:59 -04:00
Jan Holesovsky
6cd5d869ef Temporary hack to pass through the reverse proxy a nocanon way.
Change-Id: Iefc8704d4b08bab6a0afabcbc9aec5ef11d2be26
2017-09-15 15:32:45 +02:00
Henry Castro
105eeddae1 loleaflet: ignore events before the document is loaded
Change-Id: Icd28854f4430786e1383a7fe6a694f3c7ce9a188
2017-09-14 17:36:45 -04:00
Jan Holesovsky
7707507ed0 Introduce Tools -> Automatic Spell Checking.
Change-Id: Icfae090f69e49bbce2cf98c53c35ab1bb6794490
2017-09-14 11:38:55 +02:00
Henry Castro
9c3393fc44 loleaflet: fix background color of the menu item in disabled state
Change-Id: Idbe08dcd1fd1bb885f77478e3ad314be392a140d
2017-09-13 12:37:10 -04:00
Henry Castro
7c1e1120c6 loleaflet: ensure initialize map components before the document is loaded
Change-Id: I3b6219926f0f9d0306ef25bc5f9a9145410bac74
2017-09-13 11:14:17 -04:00
Jan Holesovsky
c5fc1594e1 HA: Pass WOPISrc= param in all the requests that need to...
...end up in the same loolwsd instance.

Change-Id: I69c4f5be0c0a6f4ffdec6dd571a5d62f2df4b1fb
2017-09-08 17:04:05 +02:00
YiiChang Yen
488c2e98f3 loleaflet: Sortting font-select list localelly
Change-Id: I6ebe7a30e0d47776986aa67b44de7b2bc1d25fca
Reviewed-on: https://gerrit.libreoffice.org/41873
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-08 11:22:17 +02:00
Marco Cecchetti
5112f33d09 Disable slideshow feature when DisableExport property is set.
Change-Id: I424da9abf2bba737c2985c6dcbb2ab9dbee4770c
Reviewed-on: https://gerrit.libreoffice.org/42081
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-07 22:07:46 +02:00
Henry Castro
3b6af443bd loleaflet: related to tdf#107806
Change-Id: Ifd6bd15538007416747accf7b0ad602292b1195a
2017-09-04 20:40:53 -04:00
Henry Castro
01dd761750 loleaflet: log when w2ui toolbar is not created
Change-Id: I9f8f50b628028f9f5541aa97f8c2f0ff2e72924d
2017-09-04 19:26:12 -04:00
Henry Castro
b53bcf23ae loleaflet: disable toolbar buttons before the document is loaded
Change-Id: Ia6679414f8eab54366a48b1c431ce9384d2dc8ca
2017-09-04 16:52:30 -04:00
Henry Castro
a29fa8756d loleaflet: add initial menu bar before the document is loaded
Change-Id: I9ab7f87e0ad3f4c9ff11670b8a2675d895a9c812
2017-09-04 16:35:29 -04:00
Christian Glombek
b61bcd2e53 Fix build from non-git source archives like tar or zip
Change-Id: I359056c9ad2550b625eb3e7b8e71d841eedea93b
Reviewed-on: https://gerrit.libreoffice.org/41553
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-09-03 01:30:27 +02:00
Jan Holesovsky
f7c199684c WOPI extension: DisableInactiveMessages to avoid showing message when dimmed.
Change-Id: I925602295dde95611ab1a6565dd7266460769a50
Reviewed-on: https://gerrit.libreoffice.org/41709
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-08-29 19:44:33 +02:00
Pranav Kant
29db4b447f admin protocol: 'total_mem' -> 'mem_consumed'
total_mem can be confused with total system memory or total memory
availabe to loolwsd process. Change the API to say what it actually
returns.

Change-Id: I55c246b8a1d0c5c52767520150e55616266a6d4f
2017-08-29 12:12:13 +05:30
Aditya Dewan
c61db390c9 Ruler now compatible with comments and zoom
Change-Id: Ic5e99eb3a280ce5f5f4621b20d0e44250ea30621
Reviewed-on: https://gerrit.libreoffice.org/41562
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-28 10:46:26 +02:00
Aditya Dewan
6494821d27 add numbers on ruler
Change-Id: Iff90ddedf3c808cda3bad0a397b456cb8c9e607d
Reviewed-on: https://gerrit.libreoffice.org/41336
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-28 10:46:17 +02:00
Aditya Dewan
94ee746edc Add tooltip on ruler to track change
Change-Id: I6d982dadbee18e2ce492b80f429b65e20b3905f8
Reviewed-on: https://gerrit.libreoffice.org/41352
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-28 10:45:55 +02:00
Aditya Dewan
8ef4d33e15 Adding ruler to loleaflet
Change-Id: I585850a7111eb5ab70bc5b51a508eb29317b92ca
Reviewed-on: https://gerrit.libreoffice.org/40461
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-28 10:45:33 +02:00
Pranav Kant
29aef0af4b loleaflet: Mention the reason of closing websocket to WOPI hosts
Reason is part of the JSON of post message with ID, 'Session_Close'.

Change-Id: I51a465f63fbd80843292a3f19c5b89f920301194
2017-08-25 18:46:39 +05:30
Aditya Dewan
4f775788b2 tdf#107278 bug fix | misinterpratation of units related to network usage
Change-Id: I22bccfe1970b11a0284d0e7ecee9e71f4b0522f7
Reviewed-on: https://gerrit.libreoffice.org/41327
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-21 12:18:30 +02:00
Aditya Dewan
0cf9c8791f tdf#107278 Beautification of graphs
- better looking axis
- smooth transition for axis and data path

Change-Id: I419a1e9a0691fc4b6a396a970a438431aa724d9c
Reviewed-on: https://gerrit.libreoffice.org/41313
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-21 12:07:37 +02:00
Aditya Dewan
c3711a4375 Extending WOPI implementaion to introduce 'Save As' feature
Change-Id: Ic4c80f4c4b54944143682c25a5878c1336787b27
Reviewed-on: https://gerrit.libreoffice.org/40946
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-17 19:25:44 +02:00
Jan Holesovsky
f8ca17278f access_header: Pass the access_header around + unit test.
Change-Id: I5d6d93e289d8faceda59deae128e8124a0193d95
Reviewed-on: https://gerrit.libreoffice.org/41243
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-08-17 13:41:07 +02:00
Cor Nouws
8a02d9eace Better wording.
Change-Id: I335dd2f6980032464f66c6ba482f6f23d7093144
2017-08-17 10:54:12 +02:00
Pranav Kant
8537d4372f Reset the flag when doc unloads
Though no harm as of now because we are calling resetAppLoaded whenever
we are emitting 'docloaded' with false status at the caller site, better
safe than sorry for future.

Change-Id: Id6d86ca2ae01a6eb32c8120df435d0535d906938
2017-08-14 19:51:43 +05:30
Pranav Kant
1a9d5c2ccc loleaflet: Handle Close_Session even if document is not loaded
Now the Close_Session Post message command can be used to close the
documents while it is loading.

Change-Id: If60391834fedc90b3dcb63848aa72503eb43888d
2017-08-14 17:42:07 +05:30
Pranav Kant
8c74d4a38d loleaflet: activate the inactivity timer after document load
The timer is cancelled right after 'statusindicator' is received, so a
document never really go to inactive mode after set inactivity time
period (unless user refocuses the document). Call _activate() to ensure
that timer is started after document is completely loaded.

Also timer shouldn't really start when the document is not yet loaded.

Change-Id: I58f5d7718c65cc37da9c3feb99ee6b16741a22a2
2017-08-11 23:27:17 +05:30
Pranav Kant
d0be89bffa loleaflet: new event, docloaded, to sync. various things
First, use the docloaded event to see whether we should be dimming the
document (make it inactive) or not. There is no point in inactivating a
document before document has completely loaded; so don't start the timer
until after the document is completely loaded.

It turns out that we were only emitting the WOPI's App_LoadingStatus
with DocumentLoaded for the first document load, but not for subsequent
reconnections. The problem here was that doclayerinit event is only
emitted during first document load (when TileLayer is -actually-
initialized), which was responsible for emitting this event. By
bifurcating the document load from document layer initialization, we
solve this problem.

Change-Id: I0b7b97fc6244ba9ebd6318d68d78d3abef2c0c08
2017-08-11 23:27:17 +05:30
Aron Budea
a75b780b8a loleaflet: don't add reply on Cancel, don't leave empty box
Reply was added when clicking Cancel. This is a regression from
0760786392

Additionally, when focus was lost on an empty, initial commit,
an empty, defunct comment box remained until reload.

Change-Id: I49a5224ff70de65623496cfcba538acb6a8086f8
Reviewed-on: https://gerrit.libreoffice.org/40915
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-11 09:56:33 +02:00
Jan Holesovsky
e7af725b7c Better description of the buttons in case of document conflict.
Change-Id: I177e0fdafef218f958f2efae7eb5ca3e099414de
Reviewed-on: https://gerrit.libreoffice.org/40888
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-08-08 16:17:38 +02:00
Pranav Kant
341c07b64f loleaflet: Explicitly mention z-index to please MS Edge 40
This is not required in any other browser, but Edge 40 requires it
otherwise the popup window upon clicking the combo box goes behind the
main #map element.

Change-Id: Ie95263f08c8af27b16a56ba2c3c7a9faa308400a
2017-08-04 17:44:57 +05:30
Pranav Kant
dbadff5551 loleaflet: Be more specific in README instructions regarding update
An `npm update` on my local tries to update all the modules to latest
version; surely we don't want it everytime only one module update is
required.

Change-Id: I2f79e77ae23edb9b8f8248ac7535e014b7b3218d
2017-08-04 17:44:57 +05:30
Marco Cecchetti
2916b99535 loleaflet: graphic selection can get misplaced if mouse is moved fast
Change-Id: I2c1893110ce76bed2c822c8d1ddd293c8f627307
Reviewed-on: https://gerrit.libreoffice.org/40643
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-08-02 12:57:48 +02:00
Andras Timar
0bfd359a7c loleaflet: create destination file's directory with po2json.py
... because the Makefile did not work on SLED11SP4 (?!)

Change-Id: I4e7468149f1c5461aeeb05d3a68e62cda1e329e5
Reviewed-on: https://gerrit.libreoffice.org/39778
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2017-07-31 19:42:32 +02:00
Jan Holesovsky
206a070554 Align the close button with the 'more' toolbar button.
Change-Id: Id7997da325adb6df89155605d6978b6da39890f4
2017-07-28 18:13:53 +02:00
Aditya Dewan
7d2bbbee28 tdf#108997 'kill document' from admin console now works.
Change-Id: I8521f0e50e8e037755d34ca2cea99abc002405ae
Reviewed-on: https://gerrit.libreoffice.org/39898
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-07-25 07:58:44 +02:00
Pranav Kant
b1194dfa3c Bin unused localized string
Change-Id: Ia8d7dc8e8084320ede4b3a43346c978cfeeb5555
2017-07-10 13:14:01 +05:30
Pranav Kant
fde57adbbf Introduce hard mode when we are OOM
Start killing documents when memory usage goes above threshold.

Also make it possible to close documents from admin instance.
In DocumentBroker::closeDocument, just set the _stop flag and wake
up the polling thread which will terminate the children, instead of
manually terminating the children.

Change-Id: Ie70e05b3fb6ea816a87b6dcfaed92cdddb94aa90
2017-07-07 21:14:53 +05:30
Pranav Kant
a20afc1ceb Lets not turn off the auto-edit mode on click
Change-Id: I2ad781a213fbca5ac0faabd1831ca2dd0723737d
2017-07-06 13:17:09 +05:30
Aditya Dewan
3a43f69116 tdf#108341 automatic editor switch and follow added
Change-Id: I5129256a0633916a3ca2cb05ccba39a5f4a5d398
Reviewed-on: https://gerrit.libreoffice.org/39299
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-07-06 09:46:49 +02:00
Aditya Dewan
49032d1dab tdf#108341 Follow any user from the userlist
Change-Id: Iab6d386f0c0b294dcd5adc9bf654de88a3804933
Reviewed-on: https://gerrit.libreoffice.org/39247
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-07-06 09:42:27 +02:00
Aditya Dewan
bc7fa9a812 admin: convert document list to drop down
Change-Id: I23635599b008fb0bfa694b4e73cb8f18f49c8ab7
Reviewed-on: https://gerrit.libreoffice.org/39170
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-07-06 09:18:09 +02:00
Pranav Kant
1e6c345715 loleaflet: Detach closebutton from toolbar
This is so because we require this also when document is opened in
readonly mode and we don't have any toolbar in the readonly mode.

Change-Id: I085d1640f52843e01370d528d6eea656b743d908
2017-06-22 19:48:24 +05:30