diff options
| author |  Alexis Degrugillier <aledeg@users.noreply.github.com>
| 2025-09-03 00:45:01 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-09-03 06:45:01 +0200 |
| commit | 94c53ae1fbb98b9f287e9112ebf73363cbcbb467 (patch) | |
| tree | 4914bb8217130b011979980b18d3eb529f0438a3 /app | |
| parent | 14a5ffe6a7ae93bc1d07ccf5aaf37402af1d3e43 (diff) | |
refactor value setting for javascript variables (#7906)
When retrieving an unset shortcut value, the error is not silenced but
instead we use the null-coalesce operator to define a default value.
See #7290
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/helpers/javascript_vars.phtml | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml index c21aa3dd5..2d2d2e364 100644 --- a/app/views/helpers/javascript_vars.phtml +++ b/app/views/helpers/javascript_vars.phtml @@ -36,30 +36,30 @@ echo json_encode([ 'version' => FRESHRSS_VERSION, ], 'shortcuts' => [ - 'actualize' => @$s['actualize'], - 'mark_read' => @$s['mark_read'], - 'mark_favorite' => @$s['mark_favorite'], - 'go_website' => @$s['go_website'], - 'prev_entry' => @$s['prev_entry'], - 'next_entry' => @$s['next_entry'], - 'next_unread_entry' => @$s['next_unread_entry'], - 'skip_prev_entry' => @$s['skip_prev_entry'], - 'skip_next_entry' => @$s['skip_next_entry'], - 'first_entry' => @$s['first_entry'], - 'last_entry' => @$s['last_entry'], - 'collapse_entry' => @$s['collapse_entry'], - 'load_more' => @$s['load_more'], - 'mylabels' => @$s['mylabels'], - 'auto_share' => @$s['auto_share'], - 'focus_search' => @$s['focus_search'], - 'user_filter' => @$s['user_filter'], - 'help' => @$s['help'], - 'close_menus' => @$s['close_menus'], - 'normal_view' => @$s['normal_view'], - 'global_view' => @$s['global_view'], - 'reading_view' => @$s['reading_view'], - 'rss_view' => @$s['rss_view'], - 'toggle_media' => @$s['toggle_media'], + 'actualize' => $s['actualize'] ?? '', + 'mark_read' => $s['mark_read'] ?? '', + 'mark_favorite' => $s['mark_favorite'] ?? '', + 'go_website' => $s['go_website'] ?? '', + 'prev_entry' => $s['prev_entry'] ?? '', + 'next_entry' => $s['next_entry'] ?? '', + 'next_unread_entry' => $s['next_unread_entry'] ?? '', + 'skip_prev_entry' => $s['skip_prev_entry'] ?? '', + 'skip_next_entry' => $s['skip_next_entry'] ?? '', + 'first_entry' => $s['first_entry'] ?? '', + 'last_entry' => $s['last_entry'] ?? '', + 'collapse_entry' => $s['collapse_entry'] ?? '', + 'load_more' => $s['load_more'] ?? '', + 'mylabels' => $s['mylabels'] ?? '', + 'auto_share' => $s['auto_share'] ?? '', + 'focus_search' => $s['focus_search'] ?? '', + 'user_filter' => $s['user_filter'] ?? '', + 'help' => $s['help'] ?? '', + 'close_menus' => $s['close_menus'] ?? '', + 'normal_view' => $s['normal_view'] ?? '', + 'global_view' => $s['global_view'] ?? '', + 'reading_view' => $s['reading_view'] ?? '', + 'rss_view' => $s['rss_view'] ?? '', + 'toggle_media' => $s['toggle_media'] ?? '', ], 'urls' => [ 'index' => _url('index', 'index'), |