Escape sourceLabel ids when invalid characters are present #3351
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ger-benjamin
reviewed
Jan 9, 2018
There was a problem hiding this comment.
I think that's better to have a function that return the escaped id and called here: https://github.com/camptocamp/ngeo/blob/2.2/contribs/gmf/src/directives/partials/displayquerygrid.html#L41
llienher
force-pushed
the
displayquerygrid-tab-headers
branch
from
d32761c
to
ba47927
Compare
|
@ger-benjamin I refactored the code. Now it is escaped at data generation (before the function that going to fill the grid). I did the change to use Ids again in the HTML instead of the labels. Labels are still used for the tab labels, so nothing change for the user. |
ger-benjamin
approved these changes
Jan 9, 2018
| /** | ||
| * Returns an escaped value. | ||
| * @param {string|number} value A value to escape. | ||
| * @returns {string|number} value An escaped valjue. |
llienher
force-pushed
the
displayquerygrid-tab-headers
branch
from
6b704fc
to
e8e42dd
Compare
llienher
force-pushed
the
displayquerygrid-tab-headers
branch
from
e8e42dd
to
bc2ae5a
Compare
|
@ger-benjamin I added two merged tabs in desktop_alt to make sure we have correct testing setup. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3273.
With this fix, we escape the IDs (generated from the value in ctrl.mergeTabs for merged tabs or OL datasource). If an invalid value would result in an invalid ID selector (css), then the value is stripped from unauthorized characters. Other change is the use of the datasource IDs for the HTML ids instead of the label value that contained spaces, etc.
Ideally ids defined in the ctrl.mergeTabs should have no spaces, or any specific characters such as parentheses, brackets, etc. This fix allow all project to work without changing ids manually, but if possible having a correct value is just best practice...
In that context I changed the value in our desktop example, while the fix was tested on the previous value, 'OSM time merged'.