Merge branch 'hotfix/1.0.2'

Author: uretgec

README.md

@@ -97,3 +97,6 @@ See LICENSE for more details.
 
 [Microsoft Edge Manifest Docs](https://learn.microsoft.com/en-us/microsoft-edge/extensions-chromium/getting-started/manifest-format) * firefox alternate
 
+## Changelog
+v1.0.2
+- compatible with github new design

VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

extension/contentScript.js

@@ -67,7 +67,7 @@ window.addEventListener("turbo:load", function(evt) {
     setTimeout(function() {
 
         // checkbox add
-        let navItem = document.querySelectorAll("div.js-navigation-item > div:first-child > svg")
+        let navItem = document.querySelectorAll("table > tbody > tr > td > div.react-directory-filename-column > svg")
         if (navItem.length > 0) {
 
             // inject checkbox
@@ -76,16 +76,16 @@ window.addEventListener("turbo:load", function(evt) {
                     const element = navItem[key];
 
                     // type: none: 0 - file: 1 - folder: 2
-                    let itemType = element.getAttribute("aria-label")
-                    if (itemType === "Directory") {
+                    let itemType = element.getAttribute("class")
+                    if (itemType == "icon-directory") {
                         itemType = 2
-                    } else if (itemType === "File") {
+                    } else {
                         itemType = 1
                     }
 
-                    let pathElement = element.parentElement.nextElementSibling.querySelector("div > span > a")
+                    let pathElement = element.parentElement.querySelector("div.overflow-hidden > h3 > div > a")
                     if (!!pathElement) {
-                        element.parentElement.insertAdjacentHTML("beforebegin", "<div role=\"gridcell\" class=\"mr-3 flex-shrink-0\"><input class=\"gitd-tree-checkbox\" type=\"checkbox\" data-name=\""+pathElement.innerText+"\" data-type=\""+itemType+"\" @click=\"toggleSelectList\"></div>")
+                        element.parentElement.insertAdjacentHTML("afterbegin", "<div role=\"gridcell\" class=\"mr-3 flex-shrink-0\"><input class=\"gitd-tree-checkbox\" type=\"checkbox\" data-name=\""+pathElement.innerText+"\" data-type=\""+itemType+"\" @click=\"toggleSelectList\"></div>")
                     }
                 }
             }

extension/lib/gitdmanager.js

@@ -71,7 +71,7 @@ document.addEventListener('alpine:init', () => {
                 let itemPathElement = this._findNavItemPath(hostname, element)
                 if (!!itemPathElement) {
                   let itemType = this._findNavItemType(hostname, element)
-                  element.parentElement.insertAdjacentHTML("beforebegin", this._findNavItemCheckbox(hostname, itemPathElement.innerText, itemType))
+                  element.parentElement.insertAdjacentHTML(this._findInsertPosition(hostname), this._findNavItemCheckbox(hostname, itemPathElement.innerText, itemType))
                 }
             }
           }
@@ -80,10 +80,28 @@ document.addEventListener('alpine:init', () => {
 
     },
 
+    _findInsertPosition(hostname) {
+        switch (hostname) {
+            case "github.com":
+                return "afterbegin"
+                break;
+            case "gitlab.com":
+                return "beforebegin"
+                break;
+            case "bitbucket.org":
+                return "beforebegin"
+                break;
+        }
+        
+        return null
+    },
+
     _findNavItem(hostname) {
         switch (hostname) {
             case "github.com":
-                return document.querySelectorAll("div.js-navigation-item > div:first-child > svg")
+                return document.querySelectorAll("table > tbody > tr > td > div.react-directory-filename-column > svg")
+                // Old
+                // return document.querySelectorAll("div.js-navigation-item > div:first-child > svg")
                 break;
             case "gitlab.com":
                 return document.querySelectorAll("table.tree-table > tbody > tr.tree-item > td.tree-item-file-name > a > span:first-child")
@@ -105,7 +123,14 @@ document.addEventListener('alpine:init', () => {
       // find item type
       switch (hostname) {
           case "github.com":
-              itemTypeLabel = element.getAttribute("aria-label")
+              itemTypeLabel = element.getAttribute("class")
+              if (itemTypeLabel == "icon-directory") {
+                itemTypeLabel = "folder-icon"
+              } else {
+                itemTypeLabel = "file-icon"
+              }
+              // OLD
+              //itemTypeLabel = element.getAttribute("aria-label")
               break;
           case "gitlab.com":
               itemElement = element.querySelector("svg")
@@ -143,7 +168,9 @@ document.addEventListener('alpine:init', () => {
       // find item type
       switch (hostname) {
           case "github.com":
-              return element.parentElement.nextElementSibling.querySelector("div > span > a")
+              return element.parentElement.querySelector("div.overflow-hidden > h3 > div > a")
+              // OLD
+              // return element.parentElement.nextElementSibling.querySelector("div > span > a")
               break;
           case "gitlab.com":
               return element.parentElement.querySelector("span:last-child")

extension/manifest.json

@@ -3,7 +3,7 @@
     "name": "Gitd Download Manager",
     "short_name": "Gitd",
     "description": "Download selected files and folders as a zip files with a single click, without the need for any API key or token.",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "homepage_url": "https://github.com/git-download-manager/gitd-extension",
     "permissions": [
         "webNavigation"