Merge pull request #266 from aopell/develop

Version 7.3.2
aopell · Sep 28, 2021 · 3538c2d · 3538c2d
2 parents e32b4d5 + 260b778
commit 3538c2d
Show file tree

Hide file tree

Showing 11 changed files with 235 additions and 151 deletions.
diff --git a/css/all.css b/css/all.css
@@ -37,22 +37,22 @@
 
 /* Drop down menus (grades, applications, and user menu) */
 
-.Header-header-drop-menu-3SaYV,
-.Header-header-drop-menu-3SaYV {
+.StandardHeader-header-drop-menu-YShpU,
+.StandardHeader-header-drop-menu-YShpU {
     background-color: var(--hover-color) !important;
 }
 
-a.Header-header-drop-menu-3SaYV:hover,
-.Header-header-drop-menu-3SaYV li a:hover {
+a.StandardHeader-header-drop-menu-YShpU:hover,
+.StandardHeader-header-drop-menu-YShpU li a:hover {
     background-color: var(--background-color) !important;
 }
 
 ._1k0yk:hover:not(:active), ._3hqpj, ._3JcU2:active, ._3VHSs:focus:not(:active) {
     background-color: var(--background-color) !important;
 }
 
-[class*="Header-header-drop-menu-item-"],
-[class*="Header-header-drop-menu-"] li a * {
+[class*="StandardHeader-header-drop-menu-item-"],
+[class*="StandardHeader-header-drop-menu-"] li a * {
     color: var(--contrast-text-color) !important;
 }
 

diff --git a/css/modern/all.css b/css/modern/all.css
@@ -267,18 +267,22 @@ variable-intellisense {
   color: var(--contrast-text) !important;
 }
 
-[modern=true]:root .Header-header-button-1EE8Y,
-[modern=true]:root [class*="Header-header-drop-menu-item-"],
-[modern=true]:root [class*="Header-header-drop-menu-"] li a *,
-[modern=true]:root .Header-header-button-active-GnvKh,
+[modern=true]:root .StandardHeader-header-button-1562K,
+[modern=true]:root [class*="StandardHeader-header-drop-menu-item-"],
+[modern=true]:root [class*="StandardHeader-header-drop-menu-"] li a *,
+[modern=true]:root .StandardHeader-header-button-active-mEoTJ,
 [modern=true]:root .LGaPf svg {
   color: var(--contrast-text) !important;
 }
 
-[modern=true]:root .Header-header-drop-menu-3SaYV._1Z0RM {
+[modern=true]:root .StandardHeader-header-drop-menu-YShpU._1Z0RM {
   background-color: var(--hover-color) !important;
 }
 
+[modern=true]:root div[role="menu"] ._2awxe._3skcp._1tpub a {
+  color: var(--link-color) !important;
+}
+
 [modern=true]:root .close {
   color: var(--contrast-text) !important;
   opacity: 0.8 !important;

diff --git a/default-icons.html b/default-icons.html
@@ -70,9 +70,9 @@
                 <div class="nav-wrapper">
                     <ul id="nav-mobile" class="left">
                         <li>
-                            <a data-position="right" data-tooltip="Back to Theme Editor"
-                                class="waves-effect waves-light tooltipped" href="theme-editor.html">
-                                <i class="material-icons">arrow_back</i>
+                            <a class="waves-effect waves-light" href="theme-editor.html">
+                                <i class="material-icons left">arrow_back</i>
+                                BACK TO THEME EDITOR
                             </a>
                         </li>
                     </ul>
@@ -81,9 +81,9 @@
                     </div>
                     <ul id="nav-mobile" class="right">
                         <li>
-                            <a data-position="left" data-tooltip="Toggle Condensed Mode"
-                                class="waves-effect waves-light tooltipped" id="toggle">
-                                <i id="toggle-icon" class="material-icons">toggle_off</i>
+                            <a class="waves-effect waves-light" id="toggle">
+                                CONDENSED MODE
+                                <i id="toggle-icon" class="material-icons right">toggle_off</i>
                             </a>
                         </li>
                     </ul>

diff --git a/js/all.js b/js/all.js
@@ -293,10 +293,10 @@ let modals = [
                         { name: "atomicproton#4444" },
                         { name: "penguinee232#7792" },
                         { name: "Cody Lomeli" },
+                        { name: "Lucienne Reyes" },
                         { name: "Airbus A330-200#0001" },
                         { name: "Ark#9999" },
                         { name: "ASAMU#1919" },
-                        { name: "Baconnated Churro#4954" },
                         { name: "Blumiere#7442" },
                         { name: "Krishy Fishy#3333" },
                         { name: "meepypotato07#7816" },

diff --git a/js/background.js b/js/background.js
@@ -36,6 +36,7 @@ var Logger = {
 
 var assignmentNotificationUrl = "https://app.schoology.com/home/notifications?filter=all";
 var defaultDomain = "app.schoology.com";
+var storage = {};
 
 chrome.storage.sync.get({ defaultDomain: "app.schoology.com" }, s => {
     defaultDomain = s.defaultDomain;
@@ -219,6 +220,7 @@ function sendNotification(notification, name, count) {
 
 function onAlarm(alarm) {
     chrome.storage.sync.get(null, function (storageContent) {
+        storage = storageContent;
         if (alarm && alarm.name === "notification") {
             try {
                 Logger.log(`[${new Date()}] Checking for new notifications`);
@@ -322,6 +324,36 @@ function createLogPrefix(color) {
 
 addDomainPermissionToggle();
 
+// IMAGE_REDIRECTS = {
+//     "attendance_comment.png": "https://imgur.com/a5JETn6.png",
+//     "icons_sprite_feed.png": "https://imgur.com/5XYV6rt.png",
+//     "icons_sprite_library.png": "https://asset-cdn.schoology.com/sites/all/themes/schoology_theme/images/icons_sprite_library.png",
+//     "resources-menu-icon.png": "https://asset-cdn.schoology.com/sites/all/themes/schoology_theme/images/resources-menu-icon.png",
+//     "icons_sprite_realm.png": "https://asset-cdn.schoology.com/sites/all/themes/schoology_theme/images/icons_sprite_realm.png",
+//     "btn-sprite.png": "https://asset-cdn.schoology.com/sites/all/themes/schoology_theme/images/btn-sprite.png",
+//     "icons_sprite_new.png": "https://asset-cdn.schoology.com/sites/all/themes/schoology_theme/images/icons_sprite_new.png",
+//     "icons_sprite_calendar.png": "https://asset-cdn.schoology.com/sites/all/themes/schoology_theme/images/icons_sprite_calendar.png",
+//     "icons_sprite_med.png": "https://asset-cdn.schoology.com/sites/all/themes/schoology_theme/images/icons_sprite_med.png",
+//     "icons_sprite_large.png": "https://asset-cdn.schoology.com/sites/all/themes/schoology_theme/images/icons_sprite_large.png"
+// }
+
+// chrome.webRequest.onBeforeRequest.addListener(
+//     details => {
+//         if (storage.modernizedInterfaceIcons !== "disabled") {
+//             let pathParts = new URL(details.url).pathname.split('/');
+//             if (pathParts.length > 0 && IMAGE_REDIRECTS[pathParts[pathParts.length - 1]]) {
+//                 let redirectUrl = IMAGE_REDIRECTS[pathParts[pathParts.length - 1]];
+//                 Logger.debug(`Redirecting from ${details.url} to ${redirectUrl}`)
+//                 return {
+//                     redirectUrl: redirectUrl
+//                 }
+//             }
+//         }        
+//     },
+//     { urls: ["*://*/sites/all/themes/schoology_theme/images/*"]},
+//     ['blocking']
+// );
+
 // if (getBrowser() !== "Firefox") {
 //     // See https://bugs.chromium.org/p/chromium/issues/detail?id=966223#c3
 //     chrome.webRequest.onHeadersReceived.addListener(details => {

diff --git a/js/materials.js b/js/materials.js
@@ -352,7 +352,7 @@
         // improves performance because it's one NETWORK API call PER ASSIGNMENT, and it blocks all tooltips until all assignments are done loading
         // especially visible in large classes
         let gradeInfo = loadedGradeContainer.grades[assignment.id];
-        if (+assignment.allow_dropbox && (gradeInfo.grade === null || gradeInfo.exception)) {
+        if (+assignment.allow_dropbox && (!gradeInfo || gradeInfo.grade === null || gradeInfo.exception)) {
             // "dropboxes," or places to submit documents via Schoology
             // another API call
             loadedGradeContainer.dropboxes[assignment.id] = (await fetchApiJson(`/sections/${classId}/submissions/${assignment.id}/${userId}`)).revision;