Merge pull request #301 from aopell/develop

Version 7.7.2
aopell · Dec 21, 2022 · 45a87bc · 45a87bc
2 parents ae48217 + 02dd763
commit 45a87bc
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 37 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2021 Aaron Opell and Glen Husman
+Copyright (c) 2017-2023 Aaron Opell and Glen Husman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/js/all.js b/js/all.js
@@ -106,8 +106,8 @@ bottom.appendChild(createElement("span", ["footer-divider"], { textContent: "|"
 
 document.documentElement.style.setProperty("--default-visibility", "visible");
 
-let verboseModalFooterText = `&copy; Aaron Opell, Glen Husman 2017-2021 | <a id="open-webstore" class="splus-track-clicks" href="https://schoologypl.us/?utm_source=ext-splus-settings-footer">Schoology Plus v${chrome.runtime.getManifest().version_name || chrome.runtime.getManifest().version}${getBrowser() != "Chrome" || chrome.runtime.getManifest().update_url ? '' : ' dev'}</a> | <a href="https://discord.schoologypl.us" id="open-discord" class="splus-track-clicks" title="Get support, report bugs, suggest features, and chat with the Schoology Plus community">Discord Server</a> | <a href="https://github.com/aopell/SchoologyPlus" id="open-github" class="splus-track-clicks">GitHub</a> | <a href="#" id="open-contributors" class="splus-track-clicks">Contributors</a> | <a target="_blank" href="https://schoologypl.us/privacy" id="open-privacy-policy" class="splus-track-clicks">Privacy Policy</a> | <a href="#" id="open-changelog" class="splus-track-clicks"> Changelog</a>`;
-let modalFooterText = "Schoology Plus &copy; Aaron Opell, Glen Husman 2017-2021";
+let verboseModalFooterText = `&copy; Schoology Plus Contributors 2017-2023 | <a id="open-webstore" class="splus-track-clicks" href="https://schoologypl.us/?utm_source=ext-splus-settings-footer">Schoology Plus v${chrome.runtime.getManifest().version_name || chrome.runtime.getManifest().version}${getBrowser() != "Chrome" || chrome.runtime.getManifest().update_url ? '' : ' dev'}</a> | <a href="https://discord.schoologypl.us" id="open-discord" class="splus-track-clicks" title="Get support, report bugs, suggest features, and chat with the Schoology Plus community">Discord Server</a> | <a href="https://github.com/aopell/SchoologyPlus" id="open-github" class="splus-track-clicks">GitHub</a> | <a href="#" id="open-contributors" class="splus-track-clicks">Contributors</a> | <a target="_blank" href="https://schoologypl.us/privacy" id="open-privacy-policy" class="splus-track-clicks">Privacy Policy</a> | <a href="#" id="open-changelog" class="splus-track-clicks"> Changelog</a>`;
+let modalFooterText = "Schoology Plus &copy; Schoology Plus Contributors 2017-2023";
 
 let frame = document.createElement("iframe");
 frame.src = `https://schoologypl.us/changelog?version=${chrome.runtime.getManifest().version}`;

diff --git a/js/analytics.js b/js/analytics.js
@@ -95,7 +95,15 @@ var trackEvent = function (eventName, {
             page_location: location.href.replace(/\/\d{3,}\b/g, "/*"),
             page_path: location.pathname.replace(/\/\d{3,}\b/g, "/*"),
             page_title: null,
-            user_id: randomUserId
+            user_id: randomUserId,
+            user_properties: {
+                extensionVersion: chrome.runtime.getManifest().version,
+                domain: location.host,
+                theme: selectedTheme,
+                modernTheme: document.documentElement.getAttribute("modern"),
+                activeBeta: beta,
+                lastEnabledVersion: newVersion,
+            }
         });
 
         let trackEventOld = function (target, action, label = undefined, value = undefined) {
@@ -115,12 +123,6 @@ var trackEvent = function (eventName, {
         } = {}) {
             trackEventOld(legacyTarget, legacyAction, legacyLabel, legacyValue);
             let eventData = {
-                extensionVersion: chrome.runtime.getManifest().version,
-                domain: location.host,
-                theme: selectedTheme,
-                modernTheme: document.documentElement.getAttribute("modern"),
-                activeBeta: beta,
-                lastEnabledVersion: newVersion,
                 id,
                 context,
                 value,

diff --git a/js/grades.js b/js/grades.js
@@ -886,7 +886,7 @@ var fetchQueue = [];
                         let perRow = Array.prototype.find.call(this[0].parentElement.getElementsByTagName("tr"), e => e.dataset.id == perId);
 
                         let courseId = perRow.dataset.parentId;
-                        
+
                         recalculateCategoryScore(catRow, -scoreVal, -maxVal, true, courseId);
                         recalculatePeriodScore(perRow, -scoreVal, -maxVal, true, courseId);
                     };
@@ -1088,9 +1088,9 @@ var fetchQueue = [];
 
                                     let perId = catRow.dataset.parentId;
                                     let perRow = Array.prototype.find.call(this[0].parentElement.getElementsByTagName("tr"), e => e.dataset.id == perId);
-                                    
+
                                     let courseId = perRow.dataset.parentId;
-                                    
+
                                     recalculateCategoryScore(catRow, scoreVal, maxVal, true, courseId);
                                     recalculatePeriodScore(perRow, scoreVal, maxVal, true, courseId);
                                 }
@@ -1275,7 +1275,7 @@ var fetchQueue = [];
                                     createElement(
                                         "span",
                                         ["rounded-grade"],
-                                        {title: String(jsonAssignment.grade), textContent: String(jsonAssignment.grade)}
+                                        { title: String(jsonAssignment.grade), textContent: String(jsonAssignment.grade) }
                                     )
                                 ]
                             );

diff --git a/js/icons.js b/js/icons.js
diff --git a/manifest.json b/manifest.json
@@ -10,7 +10,7 @@
             "update_url": "https://schoologypl.us/firefox_updates.json"
         }
     },
-    "version": "7.7.1",
+    "version": "7.7.2",
     "icons": {
         "128": "imgs/[email protected]",
         "64": "imgs/[email protected]",