From 3fdbf5d7e264326fbe4a737b9eef0674beb2f301 Mon Sep 17 00:00:00 2001
From: Teresa Ou <5694027+teresa-ou@users.noreply.github.com>
Date: Wed, 15 Apr 2020 17:27:07 -0700
Subject: [PATCH] v1.4.0
---
.babelrc | 3 +
dist/manifest.json | 6 +-
dist/star-filled.svg | 3 +
dist/star-outline.svg | 3 +
dist/style.css | 329 +-
package-lock.json | 8131 ++++++++++++++--------
package.json | 10 +-
src/bundling/Bundler.js | 58 +-
src/bundling/DateGrouper.js | 109 +
src/components/BundleRow.js | 4 +-
src/components/DateDivider.js | 97 +-
src/components/PinnedToggle.js | 113 +
src/content.js | 23 +-
src/handlers/MessageSelectHandler.js | 5 +
src/handlers/PinnedMessageListWatcher.js | 50 +
src/handlers/ThemeChangeHandler.js | 14 +-
src/util/Constants.js | 16 +-
src/util/MessagePageUtils.js | 35 +-
test/MessagePageUtils.spec.js | 56 +
19 files changed, 5904 insertions(+), 3161 deletions(-)
create mode 100644 .babelrc
create mode 100644 dist/star-filled.svg
create mode 100644 dist/star-outline.svg
create mode 100644 src/bundling/DateGrouper.js
create mode 100644 src/components/PinnedToggle.js
create mode 100644 src/handlers/PinnedMessageListWatcher.js
create mode 100644 test/MessagePageUtils.spec.js
diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..b4d43ab
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+ "presets": ["@babel/preset-env"]
+}
\ No newline at end of file
diff --git a/dist/manifest.json b/dist/manifest.json
index 21e8526..44731f2 100644
--- a/dist/manifest.json
+++ b/dist/manifest.json
@@ -1,6 +1,6 @@
{
"name": "inboxy: Inbox Bundles for Gmail",
- "version": "1.3.1",
+ "version": "1.4.0",
"description": "Adds Google Inbox bundles to Gmail",
"homepage_url": "https://www.inboxymail.com",
"content_scripts": [{
@@ -36,7 +36,9 @@
"light-check.png",
"light-check@2x.png",
"light-check-all.png",
- "light-check-all@2x.png"
+ "light-check-all@2x.png",
+ "star-outline.svg",
+ "star-filled.svg"
],
"manifest_version": 2
diff --git a/dist/star-filled.svg b/dist/star-filled.svg
new file mode 100644
index 0000000..ba43295
--- /dev/null
+++ b/dist/star-filled.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/dist/star-outline.svg b/dist/star-outline.svg
new file mode 100644
index 0000000..f54c9ed
--- /dev/null
+++ b/dist/star-outline.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/dist/style.css b/dist/style.css
index 92de41e..d3cb990 100644
--- a/dist/style.css
+++ b/dist/style.css
@@ -16,7 +16,7 @@
* along with this program. If not, see
+
+ ${divider.text}
+
+ `;
+ const el = DomUtils.htmlToElement(html);
+ el.style.order = order;
+
+ el.appendChild(BulkArchiveButton.create(messages));
+
+ return el;
+}
+
/**
* Return a list of date dividers, based on the provided current date.
*
@@ -43,7 +113,7 @@ const DividerDate = {
* If date dividers aren't supported for dates in a format of the sampleDateString, returns
* an empty list.
*/
-function getDateDividers(sampleDateString, now) {
+function _getDateDividers(sampleDateString, now) {
if (!_isDateDividerSupported(sampleDateString)) {
return [];
}
@@ -109,7 +179,7 @@ function _parseDate(dateString) {
* Returns the date divider object that should be used to divide prev and curr message node,
* if any, or null otherwise.
*/
-function shouldInsertDateDivider(prevMessageNode, currMessageNode, dateDividers) {
+function _shouldInsertDateDivider(prevMessageNode, currMessageNode, dateDividers) {
for (let i = dateDividers.length - 1; i >= 0; i--) {
const dividerDate = dateDividers[i].endDate;
const prevDate = prevMessageNode
@@ -129,25 +199,8 @@ function _extractMessageDate(message) {
return _parseDate(DomUtils.extractDate(message));
}
-/**
- * Create a date divider row.
- */
-function create(divider, order, messages) {
- const html = `
-
- ${divider.text}
-
- `;
- const el = DomUtils.htmlToElement(html);
- el.style.order = order;
-
- el.appendChild(BulkArchiveButton.create(messages));
-
- return el;
-}
-
export default {
- getDateDividers,
- shouldInsertDateDivider,
create,
+ withDateDividers,
+ findMessagesForDivider,
};
diff --git a/src/components/PinnedToggle.js b/src/components/PinnedToggle.js
new file mode 100644
index 0000000..c53027c
--- /dev/null
+++ b/src/components/PinnedToggle.js
@@ -0,0 +1,113 @@
+// inboxy: Chrome extension for Google Inbox-style bundles in Gmail.
+// Copyright (C) 2020 Teresa Ou
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
+
+
+ `);
+ // Toggle immediately on click
+ //
+ // The new state of the toggle should be correct, but in case it isn't, the state
+ // also gets set based on the url upon hashchange
+ anchorElement.addEventListener('click', this._toggle);
+
+ const toggleElement = DomUtils.htmlToElement(`
`);
+ toggleElement.appendChild(anchorElement);
+
+ this.toggleElement = toggleElement;
+ this.anchorElement = anchorElement;
+
+ this._updateToggle(window.location.href);
+
+ return this.toggleElement;
+ }
+
+ /**
+ * Toggle the state visually.
+ */
+ _toggle() {
+ if (this.toggleElement.classList.contains('show-pinned')) {
+ this.toggleElement.classList.remove('show-pinned');
+ }
+ else {
+ this.toggleElement.classList.add('show-pinned');
+ }
+ }
+
+ /**
+ * Set the state based on the current url.
+ */
+ _onHashChange(e) {
+ this._updateToggle(e.newURL);
+ }
+
+ /**
+ * Update the link and styling of the toggle based on the current url,
+ * or hide the toggle if it shouldn't be shown.
+ */
+ _updateToggle(url) {
+ if (isStarredPage(url)) {
+ this.toggleElement.style = {};
+ this.anchorElement.href = `${this.baseUrl}#inbox`;
+ this.toggleElement.classList.add('show-pinned');
+ document.querySelector('html').classList.add(InboxyClasses.SHOW_PINNED_TOGGLE);
+ }
+ else if (supportsBundling(url)) {
+ this.toggleElement.style = {};
+ this.anchorElement.href = `${this.baseUrl}#${Urls.STARRED_PAGE_HASH}`;
+ this.toggleElement.classList.remove('show-pinned');
+ document.querySelector('html').classList.add(InboxyClasses.SHOW_PINNED_TOGGLE);
+ }
+ else {
+ document.querySelector('html').classList.remove(InboxyClasses.SHOW_PINNED_TOGGLE);
+ this.toggleElement.style.display = 'none';
+ }
+ }
+}
+
+export default PinnedToggle;
\ No newline at end of file
diff --git a/src/content.js b/src/content.js
index 9f10cfc..3617e13 100644
--- a/src/content.js
+++ b/src/content.js
@@ -16,9 +16,12 @@
import BundleToggler from './bundling/BundleToggler';
import Bundler from './bundling/Bundler';
+import DateGrouper from './bundling/DateGrouper';
import BundledMail from './containers/BundledMail';
+import PinnedToggle from './components/PinnedToggle';
+
import TabPanelsObserver from './handlers/TabPanelsObserver';
import MainParentObserver from './handlers/MainParentObserver';
import MessageListWatcher from './handlers/MessageListWatcher';
@@ -29,7 +32,10 @@ import {
InboxyClasses,
Selectors,
} from './util/Constants';
-import { supportsBundling } from './util/MessagePageUtils';
+import {
+ supportsBundling,
+ isStarredPage,
+} from './util/MessagePageUtils';
const RETRY_TIMEOUT_MS = 50;
@@ -53,6 +59,7 @@ const bundledMail = new BundledMail();
const bundleToggler = new BundleToggler(bundledMail);
const bundler = new Bundler(bundleToggler, bundledMail, messageListWatcher);
const starHandler = new StarHandler(bundledMail);
+const dateGrouper = new DateGrouper();
//
// Observers for handling navigation
@@ -71,6 +78,9 @@ const mainParentObserver = new MainParentObserver(mutations => {
if (supportsBundling(window.location.href)) {
rebundle();
}
+ else if (isStarredPage(window.location.href)) {
+ dateGrouper.refreshDateDividers();
+ }
});
//
@@ -123,7 +133,12 @@ function tryBundling(i, bundleCurrentPage) {
setTimeout(() => tryBundling(i + 1, bundleCurrentPage), RETRY_TIMEOUT_MS);
}
else {
+ addPinnedToggle();
startObservers();
+
+ if (isStarredPage(window.location.href)) {
+ dateGrouper.refreshDateDividers();
+ }
}
}
else {
@@ -138,6 +153,7 @@ function tryBundling(i, bundleCurrentPage) {
}
else {
bundler.bundleMessages(false);
+ addPinnedToggle();
startObservers();
}
}
@@ -149,3 +165,8 @@ function startObservers() {
mainParentObserver.observe();
tabPanelsObserver.observe();
}
+
+function addPinnedToggle() {
+ const searchForm = document.querySelector(Selectors.SEARCH_FORM).parentNode;
+ searchForm.appendChild((new PinnedToggle()).create());
+}
diff --git a/src/handlers/MessageSelectHandler.js b/src/handlers/MessageSelectHandler.js
index 5d0d5a9..7646928 100644
--- a/src/handlers/MessageSelectHandler.js
+++ b/src/handlers/MessageSelectHandler.js
@@ -19,6 +19,7 @@ import {
InboxyClasses,
} from '../util/Constants';
import DomUtils from '../util/DomUtils';
+import { supportsBundling } from '../util/MessagePageUtils';
import InboxyStyler from '../bundling/InboxyStyler';
const MESSAGE_LIST_CONFIG = {
@@ -63,6 +64,10 @@ class MessageSelectHandler {
}
_handleMessageChange(mutations) {
+ if (!supportsBundling(window.location.href)) {
+ return;
+ }
+
mutations.forEach(mutation => {
if (mutation.type !== 'attributes' || mutation.attributeName !== 'class') {
return;
diff --git a/src/handlers/PinnedMessageListWatcher.js b/src/handlers/PinnedMessageListWatcher.js
new file mode 100644
index 0000000..4ba9b3b
--- /dev/null
+++ b/src/handlers/PinnedMessageListWatcher.js
@@ -0,0 +1,50 @@
+// inboxy: Chrome extension for Google Inbox-style bundles in Gmail.
+// Copyright (C) 2020 Teresa Ou
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see