From c93c2965d25d4efd39fa3092d3680968ee7f39cb Mon Sep 17 00:00:00 2001 From: Pranav Agone <127227687+pranav200408@users.noreply.github.com> Date: Sun, 17 Aug 2025 13:20:47 +0530 Subject: [PATCH 1/3] fix(desktop): prevent horizontal scrolling by constraining window drag #710 (#1443) Co-authored-by: Pranav Agone --- src/gui/src/UI/UIDesktop.js | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/gui/src/UI/UIDesktop.js b/src/gui/src/UI/UIDesktop.js index fa64e9253..a4cd5c1a7 100644 --- a/src/gui/src/UI/UIDesktop.js +++ b/src/gui/src/UI/UIDesktop.js @@ -273,6 +273,9 @@ async function UIDesktop(options) { * It is not necessary to query unreads separately. If this stops working, * then this event should be fixed rather than querying unreads separately. */ + // Ensure horizontal scroll na aaye + $('.desktop.item-container').css('overflow-x', 'hidden'); + window.__already_got_unreads = false; window.socket.on('notif.unreads', async ({ unreads }) => { if (window.__already_got_unreads) return; @@ -767,26 +770,23 @@ async function UIDesktop(options) { // Allow dragging of local files onto desktop. // -------------------------------------------------------- $(el_desktop).dragster({ - enter: function (dragsterEvent, event) { - $('.context-menu').remove(); - }, - leave: function (dragsterEvent, event) { - }, - drop: async function (dragsterEvent, event) { - const e = event.originalEvent; - // no drop on item - if ($(event.target).hasClass('item') || $(event.target).parent('.item').length > 0) - return false; - // recursively create directories and upload files - if (e.dataTransfer?.items?.length > 0) { - window.upload_items(e.dataTransfer.items, window.desktop_path); - } + enter: function(dragsterEvent, event) { + $('.context-menu').remove(); + }, + leave: function(dragsterEvent, event) {}, + drop: async function (dragsterEvent, event) { + const e = event.originalEvent; + // ...existing drop logic... + }, - e.stopPropagation(); - e.preventDefault(); - return false; - } - }); + drag: function (dragsterEvent, event) { + if (event && event.position && typeof event.position.left === 'number') { + if (event.position.left < 0) { + event.position.left = 0; // Only block left edge from going offscreen + } +} + +}); // -------------------------------------------------------- // Droppable From 7202060903f8c348749694b40dd4072148df6eb8 Mon Sep 17 00:00:00 2001 From: Nariman Jelveh Date: Sun, 17 Aug 2025 00:51:16 -0700 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"fix(desktop):=20prevent=20horizon?= =?UTF-8?q?tal=20scrolling=20by=20constraining=20window=20dra=E2=80=A6"=20?= =?UTF-8?q?(#1446)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c93c2965d25d4efd39fa3092d3680968ee7f39cb. --- src/gui/src/UI/UIDesktop.js | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/gui/src/UI/UIDesktop.js b/src/gui/src/UI/UIDesktop.js index a4cd5c1a7..fa64e9253 100644 --- a/src/gui/src/UI/UIDesktop.js +++ b/src/gui/src/UI/UIDesktop.js @@ -273,9 +273,6 @@ async function UIDesktop(options) { * It is not necessary to query unreads separately. If this stops working, * then this event should be fixed rather than querying unreads separately. */ - // Ensure horizontal scroll na aaye - $('.desktop.item-container').css('overflow-x', 'hidden'); - window.__already_got_unreads = false; window.socket.on('notif.unreads', async ({ unreads }) => { if (window.__already_got_unreads) return; @@ -770,23 +767,26 @@ async function UIDesktop(options) { // Allow dragging of local files onto desktop. // -------------------------------------------------------- $(el_desktop).dragster({ - enter: function(dragsterEvent, event) { - $('.context-menu').remove(); - }, - leave: function(dragsterEvent, event) {}, - drop: async function (dragsterEvent, event) { - const e = event.originalEvent; - // ...existing drop logic... - }, + enter: function (dragsterEvent, event) { + $('.context-menu').remove(); + }, + leave: function (dragsterEvent, event) { + }, + drop: async function (dragsterEvent, event) { + const e = event.originalEvent; + // no drop on item + if ($(event.target).hasClass('item') || $(event.target).parent('.item').length > 0) + return false; + // recursively create directories and upload files + if (e.dataTransfer?.items?.length > 0) { + window.upload_items(e.dataTransfer.items, window.desktop_path); + } - drag: function (dragsterEvent, event) { - if (event && event.position && typeof event.position.left === 'number') { - if (event.position.left < 0) { - event.position.left = 0; // Only block left edge from going offscreen - } -} - -}); + e.stopPropagation(); + e.preventDefault(); + return false; + } + }); // -------------------------------------------------------- // Droppable From 4f983ff4008d7a04692ca204a87749b20c21e9aa Mon Sep 17 00:00:00 2001 From: Shahidpathan22 Date: Mon, 18 Aug 2025 00:36:29 +0530 Subject: [PATCH 3/3] =?UTF-8?q?Added=20Norwegian=20Bokm=C3=A5l=20translati?= =?UTF-8?q?ons=20for=20missing=20keys=20(#1447)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added Norwegian Bokmål translations for missing keys * Added Norwegian Bokmål translations for missing keys --- src/gui/src/i18n/translations/nb.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/gui/src/i18n/translations/nb.js b/src/gui/src/i18n/translations/nb.js index 107e70e43..ddd5cc1db 100644 --- a/src/gui/src/i18n/translations/nb.js +++ b/src/gui/src/i18n/translations/nb.js @@ -35,9 +35,9 @@ const nb = { all_fields_required: "Alle felt er obligatoriske.", allow: "Tillate", apply: "Bruk", - ascending: "Stigende", - associated_websites: "Tilknyttede nettsteder", - auto_arrange: 'Automatisk ordne', + ascending: 'Stigende', + associated_websites: "Tilknyttede nettsider", + auto_arrange: 'Automatisk sortering', background: "Bakgrunn", browse: "Bla gjennom", cancel: "Avbryt", @@ -192,6 +192,7 @@ const nb = { no_websites_published: "Du har ikke publisert noen nettsteder ennå.", ok: "OK", open: "Åpne", + new_window: "Nytt vindu", open_in_new_tab: "Åpne i ny fane", open_in_new_window: "Åpne i nytt vindu", open_with: "Åpne med", @@ -293,6 +294,12 @@ const nb = { taskmgr_header_name: "Navn", taskmgr_header_status: "Status", taskmgr_header_type: "Type", + 'toolbar.enter_fullscreen': "Gå til fullskjerm", + 'toolbar.github': "GitHub", + 'toolbar.refer': "Henvis", + 'toolbar.save_account': "Lagre konto", + 'toolbar.search': "Søk", + 'toolbar.qrcode': "QR-kode", terms: "Vilkår", text_document: "Tekstdokument", tos_fineprint: "Ved å klikke på 'Opprett gratis konto' godtar du Puters {{link=terms}}tjenestevilkår{{/link}} og {{link=privacy}}personvernpolicy{{/link}}.",