8000 Disable ligatures in CSS for Ace editor / fix mode-aql.js (#13558) · arangodb/arangodb@e59f1a1 · GitHub
[go: up one dir, main page]
Skip to content

Commit e59f1a1

Browse files
Simran-BSimran-B
authored
Disable ligatures in CSS for Ace editor / fix mode-aql.js (#13558)
Also fix AQL highlighting: The bit functions were accidentally added to mode-aql.js in the build folder instead of the source folder (public)
1 parent 76dbd16 commit e59f1a1

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

‎CHANGELOG‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ devel
9898
statement could lead to a wrong count output when used in combination with
9999
an index which has been created with an array index attribute.
100100

101+
* Fixed issue #13117: Aardvark: Weird cursor offsets in query editor.
102+
103+
Disabled font ligatures for Ace editor in Web UI to avoid rare display issue.
104+
101105
* Fixed ES-784 regression related to encryption cipher propagation to
102106
ArangoSearch data.
103107

@@ -211,14 +215,14 @@ devel
211215
* More improvements for logging:
212216

213217
* Added new REST API endpoint GET `/_admin/log/entries` to return log entries
214-
in a more intuitve format, putting each log entry with all its properties
218+
in a more intuitive format, putting each log entry with all its properties
215219
into an object. The API response is an array with all log message objects
216220
that match the search criteria.
217221
This is an extension to the already existing API endpoint GET `/_admin/log`,
218222
which returned log messages fragmented into 5 separate arrays.
219223

220224
The already existing API endpoint GET `/_admin/log` for retrieving log
221-
messages is now deprecated, altough it will stay available for some time.
225+
messages is now deprecated, although it will stay available for some time.
222226

223227
* Truncation of log messages now takes JSON format into account, so that
224228
the truncation of oversized JSON log messages still keeps a valid JSON
@@ -237,15 +241,15 @@ devel
237241
shorten long log messages in case there is not a lot of space for logfiles,
238242
and to keep rogue log messages from overusing resources.
239243
The default value is 128 MB, which is very high and should effectively
240-
mean downwards-compatiblity with previous arangod versions, which did not
244+
mean downwards-compatibility with previous arangod versions, which did not
241245
restrict the maximum size of log messages.
242246

243247
- `--audit.max-entry-length`: controls the maximum line length for individual
244248
audit log messages that are written into audit logs by arangod. Any audit
245249
log messages longer than the specified value will be truncated and the
246250
suffix '...' will be added to them.
247251
The default value is 128 MB, which is very high and should effectively
248-
mean downwards-compatiblity with previous arangod versions, which did not
252+
mean downwards-compatibility with previous arangod versions, which did not
249253
restrict the maximum size of log messages.
250254

251255
- `--log.in-memory-level`: controls which log messages are preserved in

‎js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@
9696
cursor: default !important;
9797
}
9898

99+
// Ligatures can cause issues with the cursor on a few systems
100+
.ace_editor {
101+
font-variant-ligatures: none !important;
102+
}
103+
99104
//still in use???
100105
.container {
101106
margin-left: 20px;

‎js/apps/system/_admin/aardvark/APP/react/public/assets/src/mode-aql.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,13 @@ var AqlHighlightRules = function() {
9595
"(to_bool|to_number|to_string|to_list|is_null|is_bool|is_number|is_string|is_list|is_document|typename|json_stringify|json_parse|" +
9696
"concat|concat_separator|char_length|lower|upper|substring|left|right|trim|reverse|contains|" +
9797
"log|log2|log10|exp|exp2|sin|cos|tan|asin|acos|atan|atan2|radians|degrees|pi|regex_test|" +
98-
"like|floor|ceil|round|abs|rand|sqrt|pow|length|count|min|max|average|sum|product|median|variance_population|" +
99-
"variance_sample|first|last|unique|outersection|interleave|in_range|jaccard|matches|merge|merge_recursive|has|attributes|values|unset|unset_recursive|keep|" +
98+
"like|floor|ceil|round|abs|rand|sqrt|pow|length|count|min|max|average|sum|product|median|variance_population|variance_sample|" +
99+
"bit_and|bit_or|bit_xor|bit_negate|bit_test|bit_popcount|bit_shift_left|bit_shift_right|bit_construct|bit_deconstruct|bit_to_string|bit_from_string|" +
100+
"first|last|unique|outersection|interleave|in_range|jaccard|matches|merge|merge_recursive|has|attributes|values|unset|unset_recursive|keep|" +
100101
"near|within|within_rectangle|is_in_polygon|distance|fulltext|paths|traversal|traversal_tree|edges|stddev_sample|stddev_population|" +
101-
"slice|nth|position|translate|zip|call|apply|push|append|pop|shift|unshift|remove_value|remove_values|" +
102+
"slice|nth|position|translate|zip|call|apply|push|append|pop|shift|unshift|remove_value|remove_values|" +
102103
"remove_nth|replace_nth|date_now|date_timestamp|date_iso8601|date_dayofweek|date_year|date_month|date_day|date_hour|" +
103-
"date_minute|date_second|date_millisecond|date_dayofyear|date_isoweek|date_leapyear|date_quarter|date_days_in_month|" +
104+
"date_minute|date_second|date_millisecond|date_dayofyear|date_isoweek|date_leapyear|date_quarter|date_days_in_month|" +
104105
"date_add|date_subtract|date_diff|date_compare|date_format|date_utctolocal|date_localtoutc|date_timezone|date_timezones|fail|passthru|sleep|not_null|" +
105106
"first_list|first_document|parse_identifier|current_user|current_database|" +
106107
"collections|document|decode_rev|union|union_distinct|intersection|flatten|is_same_collection|check_document|" +

0 commit comments

Comments
 (0)
0