Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEATURE] Implementing user suggestions #557

Merged
merged 27 commits into from
Mar 28, 2022
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4779434
✨ Adds backend support for status check redirects (Re: #494)
Lissy93 Mar 13, 2022
5ff099e
🗃 Updates schema and adds maxRedirects to docs (Re: #494)
Lissy93 Mar 13, 2022
9e383e0
✨ Adds frontend functionality for status checks max redirects (Re@ #494)
Lissy93 Mar 13, 2022
0e101b6
🔧 Adds config file for GitPod env (#497)
Lissy93 Mar 13, 2022
f286487
🐛 Adds text/css type attr for custom stylesheets (#560)
Lissy93 Mar 14, 2022
f250890
🐛 Fixes link to @walkxhub homelab icons (#568)
Lissy93 Mar 21, 2022
6702b93
:rotating_light: Fixes bad object comparison
Lissy93 Mar 26, 2022
1f3ed13
:rotating_light: Adds missing semmi
Lissy93 Mar 26, 2022
fd2b3d8
:passport_control: Removes `/auth` from KC path (#564)
Lissy93 Mar 26, 2022
b7c84bb
:sparkles: Adds target attribute to nav links (#552)
Lissy93 Mar 26, 2022
a9ae53e
:card_file_box: Adds nav link target attribute to docs and schema (#552)
Lissy93 Mar 26, 2022
1c85d45
:bug: Fixes local image path on sub-page (#570)
Lissy93 Mar 26, 2022
cd50ceb
:bug: Fixes item size not honored (#576)
Lissy93 Mar 26, 2022
16aa14f
:necktie: Changes order item size is applied (#576)
Lissy93 Mar 26, 2022
879b3b8
:necktie: Improved opening method logic (#492)
Lissy93 Mar 26, 2022
88d8ee6
:art: Removes fixed max-width on wide-screens (#554)
Lissy93 Mar 27, 2022
f4443d0
:star2: Adss new screenshots to showcase (#505)
Lissy93 Mar 27, 2022
68b7758
:bug: Fixes str.split on tags array (#575)
Lissy93 Mar 27, 2022
c3c0472
:bookmark: Bumps to 2.0.6 and updates changelog
Lissy93 Mar 27, 2022
3d9c646
:twisted_rightwards_arrows: Rebased from master
Lissy93 Mar 27, 2022
e616d90
:zap: Allows full-screen for iframes (#524)
Lissy93 Mar 27, 2022
730a674
:art: Fix space excess below footer (#522)
Lissy93 Mar 27, 2022
56798fb
:bug: Fixes Authorization headers for Glances widget (#546)
Lissy93 Mar 27, 2022
979a776
:sparkles: Adds option for request timeout in widgets
Lissy93 Mar 27, 2022
6220f9b
:card_file_box: Adds widget request timeout to schema and docs
Lissy93 Mar 27, 2022
5480f23
:beers: Updates changelog, and removes unneded code, ready for merge!
Lissy93 Mar 27, 2022
45583ae
:bookmark: Updates changelog for V 2.0.6
Lissy93 Mar 27, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
👔 Improved opening method logic (#492)
  • Loading branch information
Lissy93 committed Mar 26, 2022
commit 879b3b8f32b954a98b4fc398bf389511469c1b61
17 changes: 13 additions & 4 deletions src/components/LinkItems/Item.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<a @click="itemOpened"
@mouseup.right="openContextMenu"
@contextmenu.prevent
:href="hyperLinkHref"
:href="url"
:target="anchorTarget"
:class="`item ${makeClassList}`"
v-tooltip="getTooltipOptions()"
Expand Down Expand Up @@ -141,6 +141,7 @@ export default {
},
/* Get href for anchor, if not in edit mode, or opening in modal/ workspace */
hyperLinkHref() {
// TODO Remove this method, and implement elsewhere
const nothing = '#';
if (this.isEditMode) return nothing;
const noAnchorNeeded = ['modal', 'workspace', 'clipboard'];
Expand Down Expand Up @@ -168,20 +169,28 @@ export default {
itemOpened(e) {
if (this.isEditMode) {
// If in edit mode, open settings, and don't launch app
e.preventDefault();
this.openItemSettings();
return;
}
if (e.altKey || this.accumulatedTarget === 'modal') {
// For certain opening methods, prevent default and manually navigate
if (e.ctrlKey) {
e.preventDefault();
window.open(this.url, '_blank');
} else if (e.altKey || this.accumulatedTarget === 'modal') {
e.preventDefault();
this.$emit('triggerModal', this.url);
} else if (this.accumulatedTarget === 'workspace') {
e.preventDefault();
router.push({ name: 'workspace', query: { url: this.url } });
} else if (this.accumulatedTarget === 'clipboard') {
e.preventDefault();
navigator.clipboard.writeText(this.url);
this.$toasted.show(this.$t('context-menus.item.copied-toast'));
} else {
this.$emit('itemClicked');
}
// Emit event to clear search field, etc
this.$emit('itemClicked');

// Update the most/ last used ledger, for smart-sorting
if (!this.appConfig.disableSmartSort) {
this.incrementMostUsedCount(this.id);
Expand Down