瀏覽代碼

refactor: unnecessary javascript and fix DateRangeSelect.php

3.x
wallo 1 年之前
父節點
當前提交
3acfc0a9dc
共有 2 個文件被更改,包括 1 次插入42 次删除
  1. 1
    1
      app/Forms/Components/DateRangeSelect.php
  2. 0
    41
      resources/js/TopNavigation.js

+ 1
- 1
app/Forms/Components/DateRangeSelect.php 查看文件

@@ -135,7 +135,7 @@ class DateRangeSelect extends Select
135 135
     {
136 136
         $currentYear = now()->year;
137 137
         $diff = $currentYear - $year;
138
-        $fiscalYearStart = Carbon::parse($this->company->locale->fiscal_year_start_date)->subYears($diff);
138
+        $fiscalYearStart = Carbon::parse($this->fiscalYearStartDate)->subYears($diff);
139 139
         $quarterStart = $fiscalYearStart->copy()->addMonths(($quarter - 1) * 3);
140 140
         $quarterEnd = $quarterStart->copy()->addMonths(3)->subDay();
141 141
         $this->setDateRange($quarterStart, $quarterEnd, $set);

+ 0
- 41
resources/js/TopNavigation.js 查看文件

@@ -1,50 +1,9 @@
1 1
 document.addEventListener('DOMContentLoaded', () => {
2
-    for (const dropdown of document.querySelectorAll('.fi-topbar-dropdown, .fi-topbar-dropdown .fi-dropdown-trigger')) {
3
-        const observer = new MutationObserver((mutations) => {
4
-            for (const { attributeName } of mutations) {
5
-                if (attributeName === 'aria-expanded') {
6
-                    updateBorder(dropdown);
7
-                }
8
-            }
9
-        });
10
-
11
-        observer.observe(dropdown, { attributes: true });
12
-    }
13
-
14
-    document.querySelectorAll('.fi-topbar-item > a').forEach(item => {
15
-        item.addEventListener('mouseenter', () => updateBorderOnHover(true, item));
16
-        item.addEventListener('mouseleave', () => updateBorderOnHover(false, item));
17
-    });
18
-
19
-    insertBgDiv();
20
-
21 2
     handleTopbarAndSidebarHover();
22 3
 
23 4
     handleScroll();
24 5
 });
25 6
 
26
-const updateBorder = (dropdown) => {
27
-    const activeItem = document.querySelector('.fi-topbar-item-active > *');
28
-    const hoveredItem = dropdown.querySelector('.fi-topbar-item > *');
29
-
30
-    if (activeItem && hoveredItem !== activeItem) {
31
-        activeItem.style.borderBottomColor = dropdown.getAttribute('aria-expanded') === 'true' ? 'transparent' : '';
32
-    }
33
-};
34
-
35
-const updateBorderOnHover = (isHovered, hoveredItem) => {
36
-    const activeItem = document.querySelector('.fi-topbar-item-active > *');
37
-    if (activeItem && hoveredItem !== activeItem) {
38
-        activeItem.style.borderBottomColor = isHovered ? 'transparent' : '';
39
-    }
40
-};
41
-
42
-const insertBgDiv = () => {
43
-    document.querySelectorAll('a.fi-topbar-dropdown-list-item').forEach(anchor => {
44
-        anchor.insertAdjacentHTML('beforeend', '<div class="bg"></div>');
45
-    });
46
-};
47
-
48 7
 const handleTopbarAndSidebarHover = () => {
49 8
     const topbarNav = document.querySelector('.fi-topbar > nav');
50 9
     const sidebarHeader = document.querySelector('.fi-sidebar-header');

Loading…
取消
儲存