It sets a reply's status to "resolved" only if its parent is resolved.
I can't remember why we implemented this like this before.
But now, we don't need to.
Signed-off-by: Gökay Şatır <gokaysatir@collabora.com>
Change-Id: Ia31dab0237d3b89e5d391cf87394514d18b595f7
Copy an image to the clipboard, click Paste -> Paste special on the
notebookbar in Firefox: the image is pasted, but the paste special
dialog doesn't close.
What happens here is that Firefox lacks navigator.clipboard.read(), so
the relevant code is Clipboard.js dataTransferToDocumentFallback(), not
the new _navigatorClipboardGetTypeCallback(). Here e.g. copy from
desktop Writer (html+text) would lead to a _doInternalPaste(), which
would call _checkAndDisablePasteSpecial() for us, but the image case
returns early, so the closing doesn't happen.
Fix the problem by explicitly calling _checkAndDisablePasteSpecial()
before returning early. In contrast with the other uses of
_checkAndDisablePasteSpecial(), we don't need to call the paste or paste
special uno command (since _asyncReadPasteImage() takes care of pasting
with a websocket comment), so it's fine to ignore the return value.
No testcase, our cypress tests run on Chrome, and this happens only with
Firefox.
Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I751d234edfdf9e8fb37f2bf2d6b3f3d8e65a27f4
insert shape now shows all the items in one column.
fix it so we have rows
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I371f7fa233e46a62dbb6637d934bc5ceb5cdecb0
problem:
when you try to reply to long comment, it would be resized
and subsequntly reply box will take space and other comments
will not make enough space for it
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I4d81904721e5bb196947598d0dca211ee9d480a6
problem:
when comment was on the edge of the document/screen(vertically)
resize was called which ultimately collapsed the comments in small screen
which could not be expanded unless scrolled further from edge.
It was more problematic for the threads,
if entire thread could not fit in the screen it was always failing to expand
regression from bac4161
it nullifies the effect from 81b00e7
now if comment is added at the end of the document and it goes beyond doc boundry
doc will not scroll automatically to make entire comment visible
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I198b4887ae19ca0c17ba1453960cd36a66beb04d
problem:
when long thread did not fit on screen and actions were performed
on last comments of thread which put root comment out of view,
it will cause scroll back to root comment (i.e: reply)
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I23d699425dc2dff1cfeddf6ab9be7131f80c3a31
select function now can take care of reselection and layout update
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I2a061643ec190d5b2d005b940923a28131ed6cb0
Copy an image in Firefox, paste in Chrome with the Paste button or with
Ctrl-V. Nothing happens in Calc, Writer gives you a popup to copy the
image, which is already the case.
What happens is that Clipboard.js already had some code to guess when
the HTML only contains an image, but while Chrome puts '<img ...' to the
clipboard, Firefox puts '<meta ...><img ...', so we don't recognize the
content as image.
Fix the problem by adding a new isHtmlImage() function to Clipboard.js
that handles both markups and use it from both places that deal with
paste (Paste button, keyboard).
Note that this manual parsing is needed, because the input is user
provided, so DOMParser or innerHTML would not be safe.
Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: Ia1340cd3777c5597e3fd257e905e9cc637802bcc
Previously using the onscreen keyboard would shrink the visual viewport
while leaving the elements at the same size, meaning some of the content
had to be offscreen. As we scrolled the page to have the cursor in view,
this would move the notebook bar offscreen.
To avoid the possibility of the cursor leaving the screen or the bottom
toolbar being offscren, we can use the VisualViewport API to force the
logical viewport to have the same size as the visual one
This won't have an effect in iframes as the logical and visual viewport
in iframes are always the same, and we already scale to 100% height by
default anyway
Signed-off-by: Skyler <skyler.grey@collabora.com>
Change-Id: I07726bee8b61334f6a32e873ab2d5428fa60dca3
Hidden contentNodes (in annotation) may become visible during resize.
Looks like setting style.max-height also change style.display.
Now i set it only if style.display is not none.
Signed-off-by: Attila Szűcs <attila.szucs@collabora.com>
Change-Id: I30f2eb75cb3ccb5b43044cef856314b0e35b9300
Make comments window bigger, if needed, and possible.
Selected commits grow up to MAX size, even if there is no space for it.
There is 2 constant limitation:
MAX - --annotation-max-size this is the maximum size commentText window
can grow. If the comment have more text, than it will have scrollbar.
MIN - --annotation-min-size if there is not enought space, but comment
have more text, this is the minimum size of commentText window.
note: commentText window can be smaller then MIN, if it has less text.
During doLayout:
first, in resetCommentsSize comments size resets to default.
(max-height = MIN size.)
after comments positioned with loopUp / loopDown,
resizeComments check all comments (maybe it could be optimized)
If a comment have more text as its actual size, then
it check the space between this, and next comment..
and resize this comment.
If there is not enought space after the comment, then
it check for more space between this, and previous comment, and
resize + move up the comment as much as needed.
Signed-off-by: Attila Szűcs <attila.szucs@collabora.com>
Change-Id: Ie7b0971febd8c965b01ebe23125eac4eded1a742
Signed-off-by: Attila Szűcs <attila.szucs@collabora.com>
We see multiple tooltip problem on drawing area widgets.
Example case:
Add basic shape into a writer document
Right click on shape and open Position and Size dialog
Select the Rotation tab
Hold the rotation angle widget and drag around itself
When you inspect the "Rotation Angle" tooltip, count may be 600
We expect only 1.
So we prevent to show another tooltip if we have already one.
Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com>
Change-Id: I2f548f8c7afce8095e83a6faa3722e164f990210
Replace dropdownmarker with an instance of HTMLObjectSection, which doesn't use lat/lng.
Signed-off-by: Gökay Şatır <gokaysatir@collabora.com>
Change-Id: I152ed3ea4120c0682d057b2beedd4e5d8910da17
it is not used anymore: see commits with remove-w2ui prefix
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Ifc0034dcb28455204e490d0d21e97af22d3c8ae8
And add self made ui-scroll-reight/left items with
primary color tiangle. We should replace it at some
point with something more pretty.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I67530c6352b8356214399f324b55bbf9bc24f876
This was just a workaround to keep tests working till they are fixed to
not assume we do an implicit 'copy' as soon as we have a text selection.
Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I37d16ee2841c41593a5af2fb6ceba025fe1c79e0
SavedUIState is a ui_defaults option to ignore any user preferences for
state when loading, it was added in
https://github.com/CollaboraOnline/online/pull/7575
We need to set SavedUIState explicitly on mobile, which the following
pulls do for iOS and Android respectively:
- https://github.com/CollaboraOnline/online/pull/7908
- https://github.com/CollaboraOnline/online/pull/7912
Unfortunately, setting it to false can cause some nasty bugs, such as
inability to change theme to light. It also intentionally ignores user
preferences when you reopen a document, but this isn't particularly
desirable on mobile.
I believe it to be an oversight that the option was set to `false`
rather than `true`, as `true` was the behavior before the ui_default
option was added and neither change gives a reason for it to be false
rather than true.
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: I30ce445db1b7e69a3b44eec3fb4689c463233b1f
- we need to also consider `th` tag to make it display none
- it's a empty text span so do not that extra space.
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: Ib83d42f64a0115fdc4d17a8f7e952419a84cc9d5
now reply count node multipurpose, it also indicates
if a comment which was being edited is collapsed
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I18a676885deea0afa30eb20505a76239e11c5493
problem:
when in small window, comment was autosaved,
it wasn't collapsed but would hang on the edge of the screen half visible.
We can't collapse the comment directly as user will not be able to find again
which comment was being edited.
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I9393e7f2b53d8ea37273cc2290cc74636c514cb5
Remove _cellCursor and use app.calc.cellCursorRectangle -> SimpleRectangle.
Turn _prevCellCursor,_cellCursorOnPgUp, _cellCursorOnPgDn into SimpleRectangle.
Remove horizontalDirection and verticalDirection calculations. They are not used. Also remove them from _onUpdateCellCursor function.
Use app.calc.cellCursorVisible instead of empty rectangle checks.
Set variables to null to re-init them instead of assigning them empty rectangles.
Push lat/lng usage through markers (leaflet things).
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: I4b258a72f1ac3c94ccf25a07d0e7dab232165b90
- it's not user friendly to just see color code with a radio button.
- this patch will show color image preview for filter by color options according to the color code
- it will applied only for dialogs with filter using color codes in `Autofilter`
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: Ifc67a2692df5c9b5c332c8a15d5ad92cde4f4bf8
Before this commit, in both cases we were not using tooltip
method (which is used everywhere) thus, resulting in inconsistent
tooltip styles, sizes and no animation (these ones were just native
browser tooltips)
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: If7f6213f507f5c439ceaaeb1c713c7680cf563d5
Before this commit buttons such as bold (in the notebookbar) or
sidebar button (in the top toolbar) would not change the cursor on hover
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Ief075b4f4d187f6a5d87458d02077c0deaf69fe6
The code is old and it is not used anymore by
new changes did it.
..
Change-Id: Id163cba7f586e3a083bff4cbb169a5d16e4b0cce
Signed-off-by: Henry Castro <hcastro@collabora.com>
- We allow the slide menu and the few presentation commands
Signed-off-by: Hubert Figuière <hub@collabora.com>
Change-Id: If2533450a3b2af365a89f780dca32daf87c0758a
Currently translated at 53.1% (254 of 478 strings)
Translated using Weblate (Hebrew)
Currently translated at 52.9% (253 of 478 strings)
Translated using Weblate (Hebrew)
Currently translated at 100.0% (585 of 585 strings)
Co-authored-by: Yaron Shahrabani <sh.yaron@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/collabora-online/help/he/
Translate-URL: https://hosted.weblate.org/projects/collabora-online/ui/he/
Translation: Collabora Online/Help
Translation: Collabora Online/UI
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I45cf1906cca418011e62178e2d6064949707c63b
problem:
if comment thread is very long and some action is
performed to the last comments which puts root comment out of view,
entering modify or reply mode will make scroll to root comment.
This makes editing comment/reply go out of view
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I99f8df6886a69242b3db92674516678a61d2904f
- Make the Insert tab : insert annotation in similar place between
apps
- Use the same accesskey (accessibility, shortcut) in between apps and
the same as the one used inside of Home tab
- Writer: Insert tab
- Insert annotation: Add missing DE accesskey
- Insert remotelink: Add missing accesskey
- Make both insert tabs more compact by making sure hyperlink and
remotelink stacked on both apps
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Icb8c512d437a8c328e6acf2cc41fc335d660af26
- Promote to big button
- Use the same from the previous position to make the whole tab more
- compact by changing the insert image to a simple toolitem
- Change location in the home tab so it's easier to reach and it's
more consistent between writer and impress
- Use the same accesskey (accessibility, aka shortcut) between both apps
Cypress top_toolbar_spec.js needed to be updated to make sure scroll
indicator do not cover when attempting to access it
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I0b3f3b83772317263c9d5d3d0e7f35d831eaa1ed
In 79028c6f881dd19ecbffa2c0653634879dd35496 I replaced an instance of
using this.map._docLayer._viewId as if the user is not in the document
this becomes your own view ID and shows the wrong avatar. Unfortunately
I missed CommentListSection which has the same code.
As we already have a viewId fetched a little later down, I opted to use
it rather than get another myself
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Ieda06e03902effe9be8fef3623b73d3caeef6f65
Trying to paste from the notebookbar in a setup which is not localhost
but uses http resulted in a JS exception:
> Clipboard.js:863 Uncaught TypeError: Cannot read properties of undefined (reading 'read')
We assumed that navigator.clipboard is always defined, but then its
'read' and 'write' properties may be undefined.
Fix the problem by abstracting this, and check for navigator.clipboard
as well in global.js.
Can be tested by disabling https in coolwsd.xml and changing localhost
to the real local IP in the make run URL.
Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I1dab14e311066fa640dbba65dfcc35526a6886d7
Previously the following issues were present when columns were frozen
- The frozen column was allowed to move, this was exacurbated when I
made it easier to move in my 'calc: pinch-zoom:' commits,
(3ba8257c64 to
b378a0fd77). This is now fixed
- A regression was also introduced in that range where the selected cell
marker would become offset if you placed it in a frozen section then
pinched to zoom. This is also fixed
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: I07f70a32e5cb68aeb759fd6cad626b2d4c0eed72
problem:
if calc->view tab-> dark theme button is clicked,
if button is clicked from icon it works fine,
but if button is clicked on label event is triggered twice,
which means theme would be restored to first
reproducible only in firefox
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: Ie645df86651a7507582de44147885a2b62384ddb
problem:
could not insert more than one comment in calc
regression from fcb6367
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I30b52569a48d5f1d0bb2a3fe9f6f6e7c6bd43c80
- Hide `Set outline format` uno button
- we will add this option again after fixing the dialog issue on mobile view for Outline option in `Bullets and numbering`
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: I270b78b7b9f00fd7b0f12c348794e3d3da3e653e
a problem since:
commit 72b2ce4bb6
Author: Caolán McNamara <caolan.mcnamara@collabora.com>
Date: Wed Oct 25 19:19:08 2023 +0100
we don't need to round-trip through core to reposition notes
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Change-Id: If00ae17a8e80ca3f8d2a530efa6cdba90207be56
Fix getViewRectangles function - it's used now.
Remove "_cellCursor" usage from CalcTileLayer.
Modify tests for the new changes.
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: Ia5ec5a6e89d7d64df2041112936a16ec06c4da93
Add CellCursorSection - not used yet.
Start using app.canvasSize variable.
Use simpleRectangle more.
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: I2cd4e23897c918679a0a385e1ca2d04117fd71c6
with cbf452b03d drop
indicator was not shown if the cursor is over the <div> elements
that inside the tabs
- fix by using e.currentTarget instead of e.target
and do some checks while on _handleDragLeave
Signed-off-by: Bayram Çiçek <bayram.cicek@collabora.com>
Change-Id: Iec8e246f18e553487b0eb0d9264cff8bb37b6305
Statusbar items which are not active previously were grey.
Recover that styling and do cleanup to not specify CSS in the
JS code.
We use that only for items which are active/inactive - not
for just labels
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Ic5beb7b2fa398d594cfa035d4cbcfe6f40cae787
problem:
in writer when comment is added at the end of document,
it may go out of view and covered by the status bar and can't scroll any further
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: Ia40ea128cd36a904ee5030bb7399da183e21f44d
In e855aa6114bda90fdd64fbcbb32a77adcf7938f4 a regression was introduced
where a comment avatar was set to your avatar if the user was not in the
document
This commit returns it to the previous behavior, which had a "default"
avatar instead. It might instead be nice to embed avatars in the
document to avoid the avatars being missing, however the previous
behavior is far less confusing than the regressed behavior and is far
easier to get to than embedding avatars in the document
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: I82834089062b1e7c2570d9fd78c7e1a3077f4c96
- it might happen viewinfo message arrives before status message,
viewinfo message update view list with old _viewId because new _viewId
after reconnection is not avaialable yet
- this patch fixes this by reseting the _viewId on socket close and call
updateviewlist event after client gets new _viewId from status message
Signed-off-by: Rashesh Padia <rashesh.padia@collabora.com>
Change-Id: I88a6ade574faa1368b1635db891fe87f89fa080e
- also might fix the duplicate user on reconnect
Signed-off-by: Rashesh Padia <rashesh.padia@collabora.com>
Change-Id: Id302d79dd664d2e4efd6b4ba49972b3634b19569
In PR https://github.com/CollaboraOnline/online/pull/8700
We renamed some variables and removed usages of cellCursorXY.
One was forgotten and causing null ptr reference.
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: I840cc711076e4473dee8b6a1b823a362e0eecd84
Ensure all preview tiles array is equal length of preview queue
to be processed.
Change-Id: I37a8109a1d02d7dd761c9fbd36a7d0aa8102f7c3
Signed-off-by: Henry Castro <hcastro@collabora.com>
The function '_processPreviewQueue' it request only
visible preview parts, it was an old code that it
needs to be updated.
Change-Id: I56519c328fb3bec70ca1fce2730f5146dc254fa5
Signed-off-by: Henry Castro <hcastro@collabora.com>
If wopi.UserCanWrite tells us we can't write the file no reason to show the edit button
that would do nothing anyway.
Fix https://github.com/CollaboraOnline/online/issues/8686
Signed-off-by: Hubert Figuière <hub@collabora.com>
Change-Id: I4f6d1f8d8be520e422e260f2e532cb86541e8d0f
Don't allow separator and spacer (placeolder which expands)
to be target of a focus when we use tab key.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I724604eb299c65e4709d3e7708f514c312188393
At least on iOS, the new paste handler needs to send an uno message to
the LibreOffice code.
Also, completely remove fix for GitHub issue #5839. It no longer worked
and will be handled in a patch to LibreOffice's native iOS clipboard
handling code. Ultimately, GitHub issue #5839 was caused by the iOS
clipboard code's failure to never fire a "clipboard content changed"
event. So, the LibreOffice application layers never updated their
pasting enabled state.
Signed-off-by: Patrick Luby <guibomacdev@gmail.com>
Change-Id: I4e198a45d863e3ecaf1dd04e85ce9d0d9b1a0894
It didn't work: prettier still used double quotes as a standard
so it was not possible to pass make check
This reverts commit 7c5c5bd47b.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Ic04f1591dc39bbfe522ed2b840c543ec42b3ffa3
Problem :
- Open the document which have some comment from other User
- we can see that they are same as the logged in user avatar
regression
- this is a regression from commit e855aa6114
- we were paasing url of user which is logged in and that should not happning for other user avatar image
Solution: - while setUserImage function pass viewId
- this will help to identify the user Info from map
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: I5ee8b41c2e58a4ba15ecf551b264f944aa926da8
Avatars on the user list where shown too big
When userlist-dropdown was separated from userListHeader as a
JSDialog, the proper avatar-img css stopped applying.
Signed-off-by: Jaume Pujantell <jaume.pujantell@collabora.com>
Change-Id: I58539c492758c4ecea09d598ba7e113034078cd9
- Readonly option was only present in writer before this patch
- this will add option for all other Apps: Calc,Draw,Impress
There is slight issue while getting the read-only flag for MobileTopBar .
- `app.map. isReadOnlyMode ()`: Still not work because at point of getToolItems() no permission had be setted in permission.js file for function `isReadOnly()`
- it means this._permission still undefined when we cal `app.map. isReadOnlyMode ()` from Control.MobileTopBar.js-
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: I1f5fa012218ec1025ae32e33a99363fd2ffb87ab
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
- we disabled some specific button on mobile top toolbar
- but just disabling it won't hide that from UI
- maybe it is better to not show those buttons
- it also occupies much space in top view
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: I5609fb5d02bcb0590a430df73ef4568ca838c960
Currently translated at 100.0% (478 of 478 strings)
Translated using Weblate (Czech)
Currently translated at 100.0% (584 of 584 strings)
Translated using Weblate (Czech)
Currently translated at 98.6% (576 of 584 strings)
Co-authored-by: Stanislav Horáček <stanislav.horacek@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/collabora-online/help/cs/
Translate-URL: https://hosted.weblate.org/projects/collabora-online/ui/cs/
Translation: Collabora Online/Help
Translation: Collabora Online/UI
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Idee227b1605577163dabf22675d99ebbda590002
Currently translated at 100.0% (584 of 584 strings)
Translated using Weblate (Hebrew)
Currently translated at 51.8% (248 of 478 strings)
Translated using Weblate (Hebrew)
Currently translated at 96.2% (562 of 584 strings)
Co-authored-by: Yaron Shahrabani <sh.yaron@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/collabora-online/help/he/
Translate-URL: https://hosted.weblate.org/projects/collabora-online/ui/he/
Translation: Collabora Online/Help
Translation: Collabora Online/UI
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I20f108e6599109cfc975e046b6cb92390ab5040b
Type a word into Writer, select it, Ctrl-K, the link text should default
to the selection, but it was empty.
This happens because Toolbar.js getTextForLink() doesn't have the
pre-fetched clipboard anymore, so we return an empty string there.
Fix the problem by triggering a text selection fetch (and leaving the
clipboard alone), and then handling the hyperlink dialog on the
CanvasTileLayer.js side.
Once this is done, the usual dummy clipboard registration & copy() calls
need adding and the test passes even with the patch from
<https://github.com/CollaboraOnline/online/issues/8648#issuecomment-2037278091>.
Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: Ibd8313588e705c4b027643b452099bbf02cfe8ec
- Add aria-label to input if aria properties present in the widget data
- Add appropriate roles to input and div as per standards mentioned in MDN docs for accessbility combobox
- Modified combobox button click event to open popup using Space key as well, as mentioned in the MDN docs for accessbility
Signed-off-by: Antony <dasantony@rocketmail.com>
Change-Id: I66ebc6897e6a9a73a65f53d5cbd2f06a645dcb3f
Signed-off-by: Antony <dasantony@rocketmail.com>
Change-Id: Id39242ea2fa57f8f5a46efca7a73b529ceae088d
One way for integrations to ask for dark mode is to set URL parameters.
This works for e.g. the language, but didn't work for dark mode.
There was already a parameter for this, but it was limited to Android.
Fix the problem by exposing the parameter for non-Android as well, and
also extend global.js to default to this, but keep the local storage as
an option to customize the setting if the user wants to.
Tested with 'make run', <input type=hidden> way may need more work on
top of this.
Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I78c4115a8e337ef2b1ea9e498db2572965762bef
Note the url sanitised is the url passed to
the iframe, not the url in the popup window
Signed-off-by: NickWingate <nick.wingate@collabora.com>
Change-Id: Idad9bfaa390d83cfb083b99144cb9d0a54705287
Firefox has automatic url navigation when we use
document.write and changes the url to the parent
window. document.write may also cause additional
problems (see https://developer.mozilla.org/en-US/docs/Web/API/Document/write)
Instead change only the innerHTML of the document.
Signed-off-by: NickWingate <nick.wingate@collabora.com>
Change-Id: I55b88fd557af05b2a0e49adb7f08e9467dd4a4ba
Open an empty popup with a blank url, then set the
content of the popup to be our slideURL wrapped inside an
iframe with a user friendly title.
Focus the iframe on load so that arrowkey navigation works
and forward the eventlisterner of the iframe to the parent
window to watch for escape key calls
Signed-off-by: NickWingate <nick.wingate@collabora.com>
Change-Id: Ie1063095db51119fd45453b8b4b180fcacb6d7c1
problem:
zotero was not loading because element.text didn't exist
on adding bibliography there was error to parse JSON,
because there's some more data in string after JSON
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: If34791ae7ca79ca7fd304b506cd483e929f4d2ac
A nice followup would be a change to automatically do this on all JQuery
tooltips, maybe I will make a commit to do that later
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: I545f5e8d45849fb1b000c321b3554efd874eaaf8
Once the patch from
<https://github.com/CollaboraOnline/online/issues/8648#issuecomment-2037278091>
is applied to make CanvasTileLayer.js _onTextSelectionMsg() not fetch
the clipboard proactively, this test started to fail.
This happened because the test assumed that once a text selection is
created, we have the HTML for it, which is no longer the case.
Fix the problem by extending the dummy clipboard code to also handle
plain text and by adding a function which triggers the copy(), to
minimize the changes to the actual test code.
This is just a start, lots of other tests still need fixing, and once
the pattern is clear, common code should be extracted to
cypress_test/integration_tests/common/helper.js, probably.
Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I21ed1143470fa8026e133b0519e114a40fc0ed90
At least on iOS, the new copy handler works as intended and sends an
uno message to the LibreOffice code.
Signed-off-by: Patrick Luby <guibomacdev@gmail.com>
Change-Id: Ifa7dc0738dccf0642a9fadd48919e00bfb62e402
Use SimpleRectangle for cell cursor.
Add .clone function to SimplePoint.
Use app.file.calc.cellCursor.visible for checking the cursor visibility instead of null variables.
Replace map._cellCursorPixels with app.file.calc.cellCursor.rectangle
Remove map._cellCursorXY with app.file.calc.cellCursor.address
Replace map._validatedCellXY with SimplePoint.
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: I9b1e2c92e5029b2f184055083d35200bb5e6b8c9
after accessibility rework in notebookbar we use "-"
as separator between id sections for something...
this breaks getting the menubutton items by id,
let's avoid that character then
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I58f6c03bd635e981986b64ae2acfc43561146e8f
As in https://caniuse.com/?search=text-wrap
text-wrap property is not used in currently most
popular Firefox versions, let's change it to
more popular white-space property.
It fixed wrapping of text in statusbar in Firefox
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I0fc68fbb128db56844ae8e0174fe292ee95c572a
- desktop shows userlist on the top, don't show duplicate in the statusbar
- make behavior compatible with previous version (23.05)
- remove unused signal: it is fired but nothing is listening for it
(updateuserlistcount)
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Iabcb3b4a926c8941acf2e1425a9a28ede6e88311
This allows to share code and provide unified interface
for functionality like: show/hide/enable/disable/insert item.
Also restricted mode is supported for all the items.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I4a4e7ea43a993751b28f685544827d00b2b3668f
- User avatar should first consider is there is already extract info available or not
- if we already have that image source data then please do not set default value
- also when mode change we do preform some refresh function on all icons
- `map.on('themechanged', setupIcon, this);`
- in that case as well, first check if we have user extract info or not
- and based on that set image source URL
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: Ifbd543322f5222fa7717b40a5ae565ed2f3c9891
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
For one, getting the selection HTML all the time when we create a text
selection is a waste of resources, since only a subsequent copy needs
that HTML. For another, the complex selection case required a confusing
"two step copy" workflow, where first you press Ctrl-C, then you
download the large selection, finally you press Ctrl-C again.
The underlying problem is the same: the document.execCommand() API for
copy (and cut) is synchronous, but network operations are async, which
don't play well together.
Fix the problem by trying to use navigator.clipboard.write() instead:
the write() call still has to happen inside a magic security context
(keyboard used, click happened), but it can take a callback as a
parameter, and inside that callback it's fine to perform async network
operations, which allows both using a one-step copy and getting rid of
the HTML download on text selection change (when most of the time we
don't need it).
Tested:
- Chrome and Safari; the behavior for Firefox is unchanged, unless
about:config opts in to expose the new Clipboard API.
- HTML, plain text and image copy.
- Cut, not only copy.
- Doing this with the notebookbar button & keyboard.
- A single cypress test now uses a fake clipboard to assert copy. The
rest of the tests are left unchanged for now, but likely we need to
get rid of this implicit assumption that the copy container is updated
on selection change: different behavior for automated vs manual testing
is ugly.
Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: Ifcf16474a339f3f1dae3dc99181836e645340048
So far we had duplicated snackbar code.
Desktop version was more advanced, mobile wasn't updated.
Mobile one used mobile-wizard as a base so we had to hide
currently presented menu to show small piece of information.
Let's use desktop snackbar on mobile as well. We will be able to
remove old code path from mobile later.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I1da7a6b75591913ca0fc66f6d0e81d136c874f62
Let's allow usage of JSDialog component previously
used on desktop and tablet only - in some cases on mobile.
This case are dropdowns which we do not want to show
as separate mobile wizard screen (eg. alignment selector
from toolbar).
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Ibcfaea457c065c34644738c7bf56a2e4e53c50a3
So we can type our messages, callbacks and better manage
where message is sent
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I3290f5cf9bc08669353d3e71785baffc6fb07003
If MenuButton has custom menu defined it should
use original data.id as a command to avoid warnings
about missing icon with "-menu" suffix.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I06dfcdb0412c7d087f4002cdfff83f8157c3f237
- Added 'Contains text...' and 'Duplicate...' as menu entries under Conditional > Condition...
- Introduced a new sub-entry Top/Bottom Rules' under Conditional, with the following options:
- Top n elements
- Top n% (n percent)
- Bottom n elements
- Bottom n% (n percent)
- Above Average
- Below Average
These changes enhance the functionality of the Conditional formatting menu by incorporating commonly used options for users.
Signed-off-by: codewithvk <vivek.javiya@collabora.com>
Change-Id: I1c3c06b21a9d26e6a8966782c0af07381403c08f
Problem:
- At various places, form elements are linked to the same label both through the 'for' attribute in the
associated label, and through the 'aria-labelled by' attribute in the element itself.
- This double linkage
can lead to confusion and redundancy, especially when using assistive technologies.
What should we do:
- Remove Redundant Linkage: In most cases, the 'for' attribute in the label is sufficient to
establish a clear linkage. The 'aria-labelled by' attribute can be removed in this case to avoid
redundancy.
- Consistent Use of Attributes: Ensure consistent use of attributes throughout the website. Use
either 'for' or 'aria-labelled by' depending on the context and requirements, but avoid double
linkage
Solution :
- as we made label `for` attribute value consistent with `id` value for its corresponding `input/select` element
- https://github.com/CollaboraOnline/online/pull/8646
- now we can remove 'aria-labelled by' as there is already linkage present
- there are some cases where labels are not present, we must use `aria-labelledby` in that case.
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: I389d271280a80835fd7345e8221e3777f8f8ed51
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
- fix typo in cypress function name
- unify mobile and desktop searchbar controls
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I2212f588ca720634b073111b1c78f10c6ee6b7ea
This way it can be reused in future code in Clipboard.js when
navigator.clipboard.write() is used, without duplication.
Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I843577e55802bcb7ad6cbdc5f83919172bc7d3e0
Problem:
- The labels for the <select> elements are being associated with a <div> element that surrounds the
corresponding <select> element instead of directly linking it to the <select> element.
- This creates an unclear semantic relationship between the label and the actual form element, affecting usability for
users with assistive technologies
- this was not only issue with `select` element but for all input selection elements in JSDialogBuilder
Solution:
- `lable` and it's corresponding `input/select` element should have same `for` and `id` values
- this patch will make `for` attr of `label` equals to `id` attr value of 'input/select' elements
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: If341174edcdb72af6fde3da14d5ed36ba0c3ae95
- in the formulabar in Calc
- type "=" then click "accept formula"
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I120f655766bc5e2b4688aec0e598da9c847478a8
- but still use class for css rules
- after rework in styling to use attribute we can drop that
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I568eedf45440f6636c31430cb98adcfdeab6aa4e
Add guard for notebookbar data and tab existence.
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: Ied5ef0f75735db12b108a9348062bcd48fd25fd2
When focus is in the notebookbar, arrow keys allow focus to be moved.
Signed-off-by: Oli <oli.baker@collabora.com>
Change-Id: Iccc9122f77c224e0190f25732ff9e4a24e4eab3e
it happens on context change (eg. shape selection) in
compact mode where context change handler used wrong
instance of toolbar
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I9b080786454a3e7ecbf5273ba609671de3f3eb01
- this helps to reuse code and keep it clean
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I029ac4f5d84f878f36a0d5d9abcecabe0ec63ad1
- reuse JSDialog Dropdown
- remove hack with overflow which was needed to show
any popup above notebookbar
- fixes scrollbar visible above compact toolbar when
switching from notebookbar mode
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I0366dbd68df20991d5fb26d116c38fb657e64c6d
- put in single place with other button rules
- apply also to .jsdialog case (selected, hover)
so it will be used in new toolbars
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Ic04e1939908e0030e710902d38846ba50954fe23
- toolbar had it's own status updates
- adjust the old code to use new toolbar functions
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I6da6b75b40678ed8d32500151b7c1e2c436a8cfe
Also fix Accept / Reject, which didn't show up.
Signed-off-by: Aron Budea <aron.budea@collabora.com>
Change-Id: Ia27b19d640fb59e24b4f7ccabc0df7f2d1fa2498
- reuse old code as much as possible
- font, fontsize, style are managed by old select2 wrapper
- move some commands to dispatcher
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I2fd1820b36f3c63a5fdcc482afbcc5ffe04e299f
Previously we clamped the pinch so it could not go outside the bounds of
the initial zoom pane (presumably this was intended to avoid you going
outside the map with your pinch).
Unfortunately, this is the initial bounds, causing a nasty edge when you
panned around too much, which is particularly noticable with the
improved zoom-pan ergonomics.
I decided to remove this altogether rather than scaling it correctly, as
I don't believe that a check to make sure you're not going outside the
map feels particularly natural when pinch-zooming around the document,
particularly as only the center of your pinch is checked.
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Ib98ca91e82bbe7f2bb9986595fc5f7928e2206c9
Previously the new zoom did not correctly calculate where the end of the
zoom should be centered, causing the zoom to jump when it finished.
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Ic6c1eb032c66af764da4efca3f015af895e75600
Previously, overlayed elements such as the cursor did not properly
follow the new zoom as they were separately calculated. To fix this, we
can use the _getZoomDocPos function to calculate where these should be
drawn
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: I39d6c926895e72be03ad33e6a9221a4f740e9b50
Previously, the document would not always properly follow your finger
when you tried to pan while in a pinch-zoom. In particular, we would
sometimes get this disatrously wrong (e.g. at some zoom levels we would
move our fingers one way and have the document go the other!).
I have rewritten the _getZoomDocPos function to avoid this, in
particular by adding a parameter to keep track of where our zoom started
from which lets us know where we need to zoom around. In the
mouse/button zoom case this doesn't change, but in the touchscreen zoom
case it informs us how much the viewport should have been moved.
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Ia87d941651da43eb5c16c8ce10a2493e7214252a
Previously if we were in animation from the end of a swipe and we started
a zoom, we would cut the animation but not continue to start a zoom. This
made surprising behavior when you could put down two fingers to stop the
ongoing movement but could not then zoom with them.
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Ib4c6e686caaf78b3637563da6fcc914c06f3055a
- move plain html controls into HTMLContent widget
- reuse scrollable bar from notebookbar
- use dynamically loaded menu entries in MenuButton
- allow to update MenuButton which contains menu id in the id
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I2b77479520c03420fefeb32dd09d6b34279e5686
If the element 'spreadsheet-tab-scroll' does not exist
when loads document, then scroll to the selected tab.
Change-Id: Iec86225f7ea97a149d455210921daaf91a4e761a
Signed-off-by: Henry Castro <hcastro@collabora.com>
Add a guard for potentially undefined functions in scroll section.
Allow arrow and home, end keys in readonly mode.
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: Ie695ebf2cd14f49fbb4db2b9ba8f81df5b289591
Tooltip can be modified only when was already initialized.
Sometimes we tried to hide it without initilization.
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I6f4a18acef6be2d3c00548f8b4408c7876d6bdfa
"An invalid form control with name='' is not focusable."
Change-Id: Ic81d91748371147beed6cbc7b43cc569412760ba
Signed-off-by: Henry Castro <hcastro@collabora.com>
Before this commit, already opened ui-tooltips were being placed on top
of everything, including modal dailogs. Fix that, set jquery css
line to the same z-index used by non-modal dialogs.
Additionally: update browser/README file so it documents this change
and clean up vex legacy bits.
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Ie7123822d96c594433ac197aeb9c651aa9b14461
Before this commit annotations could have different widths. A comment
with a very short text - not filling a line - would result in a
abnormal narrow annotation card, screenshot of the observed bug:
https://archive.org/download/collabora-online-comment-width-bug/collabora-online-comment-width-bug.png
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I7d51ebf53d5eb9e1361c59cee9ce9ba19e703299
we now load the document in the initial theme, so we don't need
this additional activation of the dark theme.
Change-Id: I523dda19cacd6fd3f81cd86ee554aacd5f73edea
Signed-off-by: Henry Castro <hcastro@collabora.com>
- icon url passed inside `setImage` function was wrong
- line spacing icons are not correctly
- this patch will correct the url before setImage
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: Ie733c79c4edae404d934953eaea20632bc18f8da
Position and Size dialog of the shape has a rotation angle widget in
rotation tab. User can drag move instead only one click on the rotation
angle widget. It causes a permanent tooltip on document. So It is better
to handle mousedown instead click to close tooltip.
Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com>
Change-Id: Idbea0bb8a56568a92f3f4d4c9ee6df1da01b7c24
Previously, we would sometimes get the same error event mulitple times,
leading to us erroneously believing that an image which loaded correctly
was invalid. This caused images to sometimes disappear, particularly
when switching to dark mode.
Additionally, some images are critical to layout so even if they fail to
load we should not 'display: none' them. We can set their src to an
invisible pixel to get a similar effect. We must assume that they have
their width/height correctly set elsewhere or things such as the broken
image would also break the layout.
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Id8e52416a60d394a00669e266595344eaa3376d2
This reverts commit 1bb727c25fd96f279fde8effd250fee29535723c, which is
change ID I16172a4d3148390896e3d475b7810598d94ceb27
The commit was a quick fix for an issue where we would sometimes process
image errors multiple times, leading to us hiding them. In the next
commit, I modify checkIfImageExists to avoid this issue entirely,
meaning that the fix is no longer needed.
The dark mode SVG added in it was a duplicate of the light SVG so can
also be removed.
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Ia5ea01f34a8b38472c885e5a8b7b227006bf9935
The core commit 'show cell cursor on in place editing' introduced a
regression: cell cursor messages grabs focus from the formula bar when
used for editing. The regression was causing the failure of
desktop/calc/focus_spec.js cypress unit test.
Signed-off-by: Marco Cecchetti <marco.cecchetti@collabora.com>
Change-Id: If4274cc510af065feb7aa13806a86746302b22b2
On switching tab not clear other view messages saved for replay.
Added cypress unit tests for checking the cell view cursor bounds.
Signed-off-by: Marco Cecchetti <marco.cecchetti@collabora.com>
Change-Id: I788828783a86038bb9d7f26648925b0e03bd560a
In Iea4d16918b054d355e6d8695e0dc1d6ededd6793, a regression was
introduced where we would check for a specific property of _map when
dragging anything. This was needed only in calc to determine the RTLness
of the sheet. Unfortunately, _map can sometimes be undefined (such as
when dragging around a comment in impress).
By moving the RTL check so it only executes if there is a map, we can
avoid this error, but the check will still run where it needs to.
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: I9994a3957e37975360126fab33ba08e807d723dd
* Enable security.enable_macros_execution in coolwsd.xml.
* Open a file with a macro.
* Click Help.
Expected result: the popup dialog should not close
Change-Id: I3981c1ddbb3782dd9ee43dc0c9dce282d2f21392
Signed-off-by: Henry Castro <hcastro@collabora.com>
It was part of the removed Vereign document signing feature.
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I46e40c10f19a1f6bc821b51553d2a8276d2407fb
Some code in this file is unused. In particular, the conditions to
fulfill touch scrolling will never be met since
I9016fc15ad3ccb3664af348fdcdca006495b0778, and the _performScroll
handler is never called. Let's delete it!
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Id34380f09300935dcb74435d8d94104d235f6f21
Previously we did not take into account whether something was RTL when
scrolling it with ScrollSection. By introduing a new isRTL function to
check this, we can do something different (in this case scrolling the
other direction) if we are controlling an element that should be RTL.
We need to introduce a function, as whether we are using RTL can change
over the lifetime of the ScrollSection
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: If4261a3e32375f6127241b846b97a3b4ac29eb0b
Previously when we were in RTL mode panning would be flipped. This
commit unflips it
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Iea4d16918b054d355e6d8695e0dc1d6ededd6793
- it is on the left below slides list
- handle disabled state in CSS for regular unotoolbuttons
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Iebff6e7db0234a4f61c532397bab697c1071595d
- SheetsBar is on the bottom in Calc, with buttons + tabs
- add callabck for edit field - only fired after ENTER
this fixes issue from FormulaBar conversion to JSDialog
- fix cypress mobile
- simplify CSS
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I7a286c87564e5ee0a89055ab4faa4daef9af31f5
In order to handle commands in a more structured way.
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: If7e2aed089cda1df59b2bf2b454b540d36391df0
To distinguish it from the local variables that it's not using.
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: I1d1fe3a6506afd43cbfc8b1084a4d321f5d743d1
Previously there was no dark mode user SVG, which led to a failed load.
Additionally, we were using L.LOUtil.checkIfImageExists which sometimes
hides the image if it is unable to substitute it for a light mode one.
This caused the layout to fail as avatars were required to properly
space everything else.
By changing this so we provide both a dark and light mode user image, we
can avoid using the function which problematically hides the images in
this case.
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: I16172a4d3148390896e3d475b7810598d94ceb27
Previously the borders and text of the following chip were hardcoded to
be black, but this doesn't work excellently in dark mode. Using the css
variable will make the text and user border always be a color that can
be read.
It may be sensible for us to also change the pool of following border
colors as they are all very dark, but that can wait for a future PR.
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Ia2dcdf24ae12f5d45f59ef7ba3c2ed8e4ab5acf4
It was part of the removed Vereign document signing feature.
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ibe8a31102eaefcfba1898ad2f31226c24e12f330
problem:
in impress get into textbox editing and then try to drag and move text box,
you get js error because map is null
regression from 9cf64b0726
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I586c5f242241aa50f62c49371c994aeb7c370525