diff --git a/.node-version b/.node-version index 94f5f26dcb..5397c87fab 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -16.18.0 +16.18.1 diff --git a/package.json b/package.json index 18b4e72883..45643f1f25 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "autoprefixer": "10.4.12", "babel-loader": "8.2.5", "babel-plugin-lodash": "3.3.4", - "chai": "4.3.6", + "chai": "4.3.7", "chalk": "1.1.3", "chromedriver": "104.0.0", "connect-history-api-fallback": "2.0.0", @@ -76,7 +76,7 @@ "eslint-config-standard": "17.0.0", "eslint-formatter-friendly": "7.0.0", "eslint-plugin-import": "2.26.0", - "eslint-plugin-n": "15.4.0", + "eslint-plugin-n": "15.5.0", "eslint-plugin-promise": "6.1.1", "eslint-plugin-vue": "9.7.0", "eslint-webpack-plugin": "3.2.0", diff --git a/src/App.vue b/src/App.vue index d6a6e98135..c14859b066 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@
-
-
+
-
- + - + + @goto="setHighlight" + @toggleExpanded="toggleExpanded" + /> + diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue index 264bc71377..6e732d1f3f 100644 --- a/src/components/mobile_nav/mobile_nav.vue +++ b/src/components/mobile_nav/mobile_nav.vue @@ -10,6 +10,8 @@
-
@@ -64,6 +68,7 @@
+ diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 26b174ff09..84f3f7de55 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -1,11 +1,14 @@ diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index f9c90a7ed3..3d5878d4d5 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -3,7 +3,8 @@ :disabled="minimalMode || disableTeleport" :to="teleportTarget" > -
-
+
@@ -88,7 +93,7 @@
- + diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js index dd332c35a5..72b7c5113f 100644 --- a/src/components/popover/popover.js +++ b/src/components/popover/popover.js @@ -43,7 +43,12 @@ const Popover = { overlayCentersSelector: String, // Lets hover popover stay when clicking inside of it - stayOnClick: Boolean + stayOnClick: Boolean, + + triggerAttrs: { + type: Object, + default: {} + } }, inject: ['popoversZLayer'], // override popover z layer data () { diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue index 623af8d2a5..9506728e43 100644 --- a/src/components/popover/popover.vue +++ b/src/components/popover/popover.vue @@ -7,6 +7,7 @@ ref="trigger" class="button-unstyled popover-trigger-button" type="button" + v-bind="triggerAttrs" @click="onClick" > diff --git a/src/components/quick_filter_settings/quick_filter_settings.vue b/src/components/quick_filter_settings/quick_filter_settings.vue index 54ea037e3e..87fcd7167e 100644 --- a/src/components/quick_filter_settings/quick_filter_settings.vue +++ b/src/components/quick_filter_settings/quick_filter_settings.vue @@ -3,6 +3,7 @@ trigger="click" class="QuickFilterSettings" :bound-to="{ x: 'container' }" + :triggerAttrs="{ title: $t('timeline.quick_filter_settings') }" > diff --git a/src/components/quick_view_settings/quick_view_settings.vue b/src/components/quick_view_settings/quick_view_settings.vue index b0413cac1e..d7c9bf3bf3 100644 --- a/src/components/quick_view_settings/quick_view_settings.vue +++ b/src/components/quick_view_settings/quick_view_settings.vue @@ -3,6 +3,7 @@ trigger="click" class="QuickViewSettings" :bound-to="{ x: 'container' }" + :triggerAttrs="{ title: $t('timeline.quick_view_settings') }" > diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue index 4eaf597dcf..c6fffc71ab 100644 --- a/src/components/thread_tree/thread_tree.vue +++ b/src/components/thread_tree/thread_tree.vue @@ -1,5 +1,5 @@ diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 8a036fd032..877a0cc080 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -47,6 +47,7 @@ v-else-if="!embedded" class="loadmore-text faint veryfaint rightside-icon" :title="$t('timeline.up_to_date')" + :aria-disabled="true" @click.prevent > -
+ diff --git a/src/i18n/en.json b/src/i18n/en.json index 08fe8e6260..bd4b993ff1 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -158,7 +158,11 @@ "lists": "Lists", "edit_nav_mobile": "Customize navigation bar", "edit_pinned": "Edit pinned items", - "edit_finish": "Done editing" + "edit_finish": "Done editing", + "mobile_sidebar": "Toggle mobile sidebar", + "mobile_notifications": "Open notifications", + "mobile_notifications": "Open notifications (there are unread ones)", + "mobile_notifications_close": "Close notifications" }, "notifications": { "broken_favorite": "Unknown status, searching for it…", @@ -807,7 +811,9 @@ "no_more_statuses": "No more statuses", "no_statuses": "No statuses", "socket_reconnected": "Realtime connection established", - "socket_broke": "Realtime connection lost: CloseEvent code {0}" + "socket_broke": "Realtime connection lost: CloseEvent code {0}", + "quick_view_settings": "Quick view settings", + "quick_filter_settings": "Quick filter settings" }, "status": { "favorites": "Favorites", diff --git a/yarn.lock b/yarn.lock index 8fcec0ce44..d101dbffd6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2890,14 +2890,14 @@ chai-nightwatch@0.5.3: dependencies: assertion-error "1.1.0" -chai@4.3.6: - version "4.3.6" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c" - integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q== +chai@4.3.7: + version "4.3.7" + resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51" + integrity sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A== dependencies: assertion-error "^1.1.0" check-error "^1.0.2" - deep-eql "^3.0.1" + deep-eql "^4.1.2" get-func-name "^2.0.0" loupe "^2.3.1" pathval "^1.1.1" @@ -3474,10 +3474,10 @@ deep-eql@4.0.1: dependencies: type-detect "^4.0.0" -deep-eql@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df" - integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw== +deep-eql@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.2.tgz#270ceb902f87724077e6f6449aed81463f42fc1c" + integrity sha512-gT18+YW4CcW/DBNTwAmqTtkJh7f9qqScu2qFVlx7kCoeY9tlBu9cUcr7+I+Z/noG8INehS3xQgLpTtd/QUTn4w== dependencies: type-detect "^4.0.0" @@ -3914,10 +3914,10 @@ eslint-plugin-import@2.26.0: resolve "^1.22.0" tsconfig-paths "^3.14.1" -eslint-plugin-n@15.4.0: - version "15.4.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.4.0.tgz#1cfe9faff1b914ecc8f71433d228eaa5fc65b111" - integrity sha512-MkoKy9/lfd52TAXK4fkABgCp0aglk82Q3viy2UOWIEpTVE/Cem5P/UAxMBA4vSw7Gy+2egPqImE9euitLGp5aw== +eslint-plugin-n@15.5.0: + version "15.5.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.5.0.tgz#8eb0773b019b88b145dd1eba687ccc9c50e71655" + integrity sha512-VCqQiZDpdm1Q9grnvy+XsENZoXDgTLqPHRQwgl9qFNNgTKR4YEnQOMN0pFB/9TbmrQ88jdeTnqTcNwRvjqMOtg== dependencies: builtins "^5.0.1" eslint-plugin-es "^4.1.0"