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

[stable28] fix/1481 focused links are truncated on 400% zoom #1485

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/Activity-732775f8.mjs → js/Activity-96320dac.mjs

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -1,3 +1,3 @@
(function(){"use strict";try{if(typeof document<"u"){var e=document.createElement("style");e.appendChild(document.createTextNode("[data-v-beb19b7d] .empty-content__icon span{background-size:64px;width:64px;height:64px}.activity__actions[data-v-beb19b7d]{display:flex;flex-direction:column;width:100%}")),document.head.appendChild(e)}}catch(t){console.error("vite-plugin-css-injected-by-js",t)}})();
/*! third party licenses: js/vendor.LICENSE.txt */
import{n as s,a as o,c as r}from"./index.es-9271aa1f.mjs";import{d as c,r as l,o as u,e as f,f as v,t as n,g as p}from"./index-482802c5.mjs";import{A as d,p as g,v as y,d as m}from"./Activity-732775f8.mjs";import{g as h,a as _,b}from"./api-00dfc954.mjs";import{l as A}from"./logger-a53a57b5.mjs";import{l as I}from"./activity-sidebar.mjs";import"./index-65a5f423.mjs";const S=c({__name:"ActivitySidebarPlugin",props:{plugin:null,fileInfo:null},emits:["reload-activities"],setup(t,{emit:i}){const e=t,a=l();return u(()=>e.plugin.mount(a.value,{context:f()?.proxy,fileInfo:e.fileInfo,reload:()=>i("reload-activities")})),v(()=>e.plugin.unmount()),{__sfc:!0,props:e,emit:i,attachTarget:a}}});var w=function(){var t=this,i=t._self._c;return t._self._setupProxy,i("div",{ref:"attachTarget"})},x=[],N=s(S,w,x,!1,null,null,null,null);const P=N.exports;const C={name:"ActivityTab",components:{Activity:d,NcEmptyContent:g,NcIconSvgWrapper:y,NcLoadingIcon:o,ActivitySidebarPlugin:P},data(){return{error:"",loading:!0,fileInfo:null,activities:[],lightningBoltSVG:I,sidebarPlugins:[]}},mounted(){this.sidebarPlugins=h()},methods:{async update(t){this.fileInfo=t,this.resetState(),await this.getActivities()},async getActivities(){try{this.loading=!0;const t=await this.processActivities(await this.loadRealActivities()),i=await _({fileInfo:this.fileInfo});this.activities=[...t,...i].sort((e,a)=>a.timestamp-e.timestamp)}catch(t){this.error=n("activity","Unable to load the activity list"),console.error("Error loading the activity list",t)}finally{this.loading=!1}},resetState(){this.loading=!0,this.error="",this.activities=[]},async loadRealActivities(){try{const{data:t}=await r.get(p("apps/activity/api/v2/activity/filter"),{params:{format:"json",object_type:"files",object_id:this.fileInfo.id}});return t.ocs.data}catch(t){if(error.response!==void 0&&error.response.status===304)return[];throw t}},processActivities(t){t=t.map(e=>new m(e)),A.debug(`Processed ${t.length} activity(ies)`,{activities:t,fileInfo:this.fileInfo});const i=b();return t.filter(e=>!i||i.every(a=>a(e)))},t:n}};var k=function(){var t=this,i=t._self._c;return i("div",{class:{"icon-loading":t.loading}},[t.error?i("NcEmptyContent",{attrs:{name:t.error},scopedSlots:t._u([{key:"icon",fn:function(){return[i("NcIconSvgWrapper",{attrs:{svg:t.lightningBoltSVG}})]},proxy:!0}],null,!1,63559581)}):[t.sidebarPlugins.length>0?i("div",{staticClass:"activity__actions"},t._l(t.sidebarPlugins,function(e,a){return i("ActivitySidebarPlugin",{key:a,attrs:{plugin:e,"file-info":t.fileInfo},on:{"reload-activities":function(T){return t.getActivities()}}})}),1):t._e(),t.loading?i("NcEmptyContent",{attrs:{name:t.t("activity","Loading activities")},scopedSlots:t._u([{key:"icon",fn:function(){return[i("NcLoadingIcon")]},proxy:!0}],null,!1,3085876643)}):t.activities.length===0?i("NcEmptyContent",{attrs:{name:t.t("activity","No activity yet")},scopedSlots:t._u([{key:"icon",fn:function(){return[i("span",{staticClass:"icon-activity"})]},proxy:!0}])}):i("ul",t._l(t.activities,function(e){return i("Activity",{key:e.id,attrs:{activity:e,"show-previews":!1},on:{reload:function(a){return t.getActivities()}}})}),1)]],2)},E=[],j=s(C,k,E,!1,null,"beb19b7d",null,null);const F=j.exports;export{F as default};
import{n as s,a as o,c as r}from"./index.es-9271aa1f.mjs";import{d as c,r as l,o as u,e as f,f as v,t as n,g as p}from"./index-482802c5.mjs";import{A as d,p as g,v as y,d as m}from"./Activity-96320dac.mjs";import{g as h,a as _,b}from"./api-00dfc954.mjs";import{l as A}from"./logger-a53a57b5.mjs";import{l as I}from"./activity-sidebar.mjs";import"./index-65a5f423.mjs";const S=c({__name:"ActivitySidebarPlugin",props:{plugin:null,fileInfo:null},emits:["reload-activities"],setup(t,{emit:i}){const e=t,a=l();return u(()=>e.plugin.mount(a.value,{context:f()?.proxy,fileInfo:e.fileInfo,reload:()=>i("reload-activities")})),v(()=>e.plugin.unmount()),{__sfc:!0,props:e,emit:i,attachTarget:a}}});var w=function(){var t=this,i=t._self._c;return t._self._setupProxy,i("div",{ref:"attachTarget"})},x=[],N=s(S,w,x,!1,null,null,null,null);const P=N.exports;const C={name:"ActivityTab",components:{Activity:d,NcEmptyContent:g,NcIconSvgWrapper:y,NcLoadingIcon:o,ActivitySidebarPlugin:P},data(){return{error:"",loading:!0,fileInfo:null,activities:[],lightningBoltSVG:I,sidebarPlugins:[]}},mounted(){this.sidebarPlugins=h()},methods:{async update(t){this.fileInfo=t,this.resetState(),await this.getActivities()},async getActivities(){try{this.loading=!0;const t=await this.processActivities(await this.loadRealActivities()),i=await _({fileInfo:this.fileInfo});this.activities=[...t,...i].sort((e,a)=>a.timestamp-e.timestamp)}catch(t){this.error=n("activity","Unable to load the activity list"),console.error("Error loading the activity list",t)}finally{this.loading=!1}},resetState(){this.loading=!0,this.error="",this.activities=[]},async loadRealActivities(){try{const{data:t}=await r.get(p("apps/activity/api/v2/activity/filter"),{params:{format:"json",object_type:"files",object_id:this.fileInfo.id}});return t.ocs.data}catch(t){if(error.response!==void 0&&error.response.status===304)return[];throw t}},processActivities(t){t=t.map(e=>new m(e)),A.debug(`Processed ${t.length} activity(ies)`,{activities:t,fileInfo:this.fileInfo});const i=b();return t.filter(e=>!i||i.every(a=>a(e)))},t:n}};var k=function(){var t=this,i=t._self._c;return i("div",{class:{"icon-loading":t.loading}},[t.error?i("NcEmptyContent",{attrs:{name:t.error},scopedSlots:t._u([{key:"icon",fn:function(){return[i("NcIconSvgWrapper",{attrs:{svg:t.lightningBoltSVG}})]},proxy:!0}],null,!1,63559581)}):[t.sidebarPlugins.length>0?i("div",{staticClass:"activity__actions"},t._l(t.sidebarPlugins,function(e,a){return i("ActivitySidebarPlugin",{key:a,attrs:{plugin:e,"file-info":t.fileInfo},on:{"reload-activities":function(T){return t.getActivities()}}})}),1):t._e(),t.loading?i("NcEmptyContent",{attrs:{name:t.t("activity","Loading activities")},scopedSlots:t._u([{key:"icon",fn:function(){return[i("NcLoadingIcon")]},proxy:!0}],null,!1,3085876643)}):t.activities.length===0?i("NcEmptyContent",{attrs:{name:t.t("activity","No activity yet")},scopedSlots:t._u([{key:"icon",fn:function(){return[i("span",{staticClass:"icon-activity"})]},proxy:!0}])}):i("ul",t._l(t.activities,function(e){return i("Activity",{key:e.id,attrs:{activity:e,"show-previews":!1},on:{reload:function(a){return t.getActivities()}}})}),1)]],2)},E=[],j=s(C,k,E,!1,null,"beb19b7d",null,null);const F=j.exports;export{F as default};

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-app.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-sidebar.mjs
@@ -1,2 +1,2 @@
/*! third party licenses: js/vendor.LICENSE.txt */
import{V as u,t as m,b as v}from"./index-482802c5.mjs";import"./index-65a5f423.mjs";const w="modulepreload",y=function(e,i){return e[0]==="."?new URL(e,i).href:e},p={},f=function(e,i,s){if(!i||i.length===0)return e();const d=document.getElementsByTagName("link");return Promise.all(i.map(t=>{if(t=y(t,s),t in p)return;p[t]=!0;const n=t.endsWith(".css"),h=n?'[rel="stylesheet"]':"";if(s)for(let l=d.length-1;l>=0;l--){const c=d[l];if(c.href===t&&(!n||c.rel==="stylesheet"))return}else if(document.querySelector(`link[href="${t}"]${h}`))return;const o=document.createElement("link");if(o.rel=n?"stylesheet":w,n||(o.as="script",o.crossOrigin=""),o.href=t,document.head.appendChild(o),n)return new Promise((l,c)=>{o.addEventListener("load",l),o.addEventListener("error",()=>c(new Error(`Unable to preload CSS for ${t}`)))})})).then(()=>e()).catch(t=>{const n=new Event("vite:preloadError",{cancelable:!0});if(n.payload=t,window.dispatchEvent(n),!n.defaultPrevented)throw t})},g='<svg xmlns="http://www.w3.org/2000/svg" id="mdi-lightning-bolt" viewBox="0 0 24 24"><path d="M11 15H6L13 1V9H18L11 23V15Z" /></svg>';u.prototype.t=m,u.prototype.n=v;let a=null,r=null;const E=new OCA.Files.Sidebar.Tab({id:"activity",name:m("activity","Activity"),iconSvg:g,async mount(e,i,s){if(a===null){const{default:d}=await f(()=>import("./ActivityTab-92ef17b4.mjs"),[OC.filePath('activity', '', 'js/ActivityTab-92ef17b4.mjs'),OC.filePath('activity', '', 'js/index.es-9271aa1f.mjs'),OC.filePath('activity', '', 'js/index-65a5f423.mjs'),OC.filePath('activity', '', 'js/logger-a53a57b5.mjs'),OC.filePath('activity', '', 'js/index-482802c5.mjs'),OC.filePath('activity', '', 'js/Activity-732775f8.mjs'),OC.filePath('activity', '', 'js/api-00dfc954.mjs')],import.meta.url);a=a??u.extend(d)}r&&r.$destroy(),r=new a({parent:s}),r.update(i),r.$mount(e)},update(e){r.update(e)},destroy(){r.$destroy(),r=null}});window.addEventListener("DOMContentLoaded",async function(){if(OCA.Files&&OCA.Files.Sidebar){OCA.Files.Sidebar.registerTab(E);const{default:e}=await f(()=>import("./ActivityTab-92ef17b4.mjs"),[OC.filePath('activity', '', 'js/ActivityTab-92ef17b4.mjs'),OC.filePath('activity', '', 'js/index.es-9271aa1f.mjs'),OC.filePath('activity', '', 'js/index-65a5f423.mjs'),OC.filePath('activity', '', 'js/logger-a53a57b5.mjs'),OC.filePath('activity', '', 'js/index-482802c5.mjs'),OC.filePath('activity', '', 'js/Activity-732775f8.mjs'),OC.filePath('activity', '', 'js/api-00dfc954.mjs')],import.meta.url);a=a??u.extend(e)}});export{g as l};
import{V as u,t as m,b as v}from"./index-482802c5.mjs";import"./index-65a5f423.mjs";const w="modulepreload",y=function(e,i){return e[0]==="."?new URL(e,i).href:e},p={},f=function(e,i,s){if(!i||i.length===0)return e();const d=document.getElementsByTagName("link");return Promise.all(i.map(t=>{if(t=y(t,s),t in p)return;p[t]=!0;const n=t.endsWith(".css"),h=n?'[rel="stylesheet"]':"";if(s)for(let l=d.length-1;l>=0;l--){const c=d[l];if(c.href===t&&(!n||c.rel==="stylesheet"))return}else if(document.querySelector(`link[href="${t}"]${h}`))return;const o=document.createElement("link");if(o.rel=n?"stylesheet":w,n||(o.as="script",o.crossOrigin=""),o.href=t,document.head.appendChild(o),n)return new Promise((l,c)=>{o.addEventListener("load",l),o.addEventListener("error",()=>c(new Error(`Unable to preload CSS for ${t}`)))})})).then(()=>e()).catch(t=>{const n=new Event("vite:preloadError",{cancelable:!0});if(n.payload=t,window.dispatchEvent(n),!n.defaultPrevented)throw t})},g='<svg xmlns="http://www.w3.org/2000/svg" id="mdi-lightning-bolt" viewBox="0 0 24 24"><path d="M11 15H6L13 1V9H18L11 23V15Z" /></svg>';u.prototype.t=m,u.prototype.n=v;let a=null,r=null;const E=new OCA.Files.Sidebar.Tab({id:"activity",name:m("activity","Activity"),iconSvg:g,async mount(e,i,s){if(a===null){const{default:d}=await f(()=>import("./ActivityTab-006fcfbd.mjs"),[OC.filePath('activity', '', 'js/ActivityTab-006fcfbd.mjs'),OC.filePath('activity', '', 'js/index.es-9271aa1f.mjs'),OC.filePath('activity', '', 'js/index-65a5f423.mjs'),OC.filePath('activity', '', 'js/logger-a53a57b5.mjs'),OC.filePath('activity', '', 'js/index-482802c5.mjs'),OC.filePath('activity', '', 'js/Activity-96320dac.mjs'),OC.filePath('activity', '', 'js/api-00dfc954.mjs')],import.meta.url);a=a??u.extend(d)}r&&r.$destroy(),r=new a({parent:s}),r.update(i),r.$mount(e)},update(e){r.update(e)},destroy(){r.$destroy(),r=null}});window.addEventListener("DOMContentLoaded",async function(){if(OCA.Files&&OCA.Files.Sidebar){OCA.Files.Sidebar.registerTab(E);const{default:e}=await f(()=>import("./ActivityTab-006fcfbd.mjs"),[OC.filePath('activity', '', 'js/ActivityTab-006fcfbd.mjs'),OC.filePath('activity', '', 'js/index.es-9271aa1f.mjs'),OC.filePath('activity', '', 'js/index-65a5f423.mjs'),OC.filePath('activity', '', 'js/logger-a53a57b5.mjs'),OC.filePath('activity', '', 'js/index-482802c5.mjs'),OC.filePath('activity', '', 'js/Activity-96320dac.mjs'),OC.filePath('activity', '', 'js/api-00dfc954.mjs')],import.meta.url);a=a??u.extend(e)}});export{g as l};
6 changes: 4 additions & 2 deletions src/components/activities/GenericActivity.vue
Expand Up @@ -177,11 +177,9 @@ export default defineComponent({
&__icon {
opacity: 0.5;
margin-top: 2px;
margin-right: 8px;
}

.avatardiv {
padding-inline: calc((32px - var(--size)) / 2);
box-sizing: content-box!important;
background-color: unset !important;

Expand All @@ -200,6 +198,10 @@ export default defineComponent({
word-break: break-word;
overflow: hidden;

&__subject {
padding: 0 5px;
}

&__message {
color: var(--color-text-lighter);
}
Expand Down