diff options
| author | kumavis <aaron@kumavis.me> | 2016-06-29 04:13:06 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2016-06-29 04:13:06 +0800 |
| commit | 4777f82ae065bf630c1f1bdc0eb64eacfb4181de (patch) | |
| tree | 608d036f502353db83d69ad4500fa0d6cf980f97 /app | |
| parent | 56087543c807e24ff7d3fd2d7b38050ae4bbb598 (diff) | |
| parent | d4708828aa780ad3995ef61d6ec8d5130639751b (diff) | |
| download | tangerine-wallet-browser-4777f82ae065bf630c1f1bdc0eb64eacfb4181de.tar.gz tangerine-wallet-browser-4777f82ae065bf630c1f1bdc0eb64eacfb4181de.tar.zst tangerine-wallet-browser-4777f82ae065bf630c1f1bdc0eb64eacfb4181de.zip | |
Merge branch 'master' into notif2
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/lib/notifications.js | 7 | ||||
| -rw-r--r-- | app/scripts/popup.js | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index 2f97f22ac..35ee5b6d7 100644 --- a/app/scripts/lib/notifications.js +++ b/app/scripts/lib/notifications.js @@ -144,8 +144,13 @@ function renderNotificationSVG(content, cb){ } function svgWrapper(content){ +<<<<<<< HEAD var wrapperSource = ` <svg xmlns="http://www.w3.org/2000/svg" width="360" height="240"> +======= + var wrapperSource = ` + <svg xmlns="http://www.w3.org/2000/svg" width="450" height="300"> +>>>>>>> master <foreignObject x="0" y="0" width="100%" height="100%"> <body xmlns="http://www.w3.org/1999/xhtml" height="100%">{{content}}</body> </foreignObject> @@ -156,4 +161,4 @@ function svgWrapper(content){ function toSvgUri(content){ return 'data:image/svg+xml;utf8,' + encodeURIComponent(content) -}
\ No newline at end of file +} diff --git a/app/scripts/popup.js b/app/scripts/popup.js index 5173507fa..5c5cf0455 100644 --- a/app/scripts/popup.js +++ b/app/scripts/popup.js @@ -65,11 +65,21 @@ function getCurrentDomain (cb) { }) } +function clearNotifications(){ + chrome.notifications.getAll(function (object) { + for (let notification in object){ + chrome.notifications.clear(notification) + } + }) +} + function setupApp (err, opts) { if (err) { alert(err.stack) throw err } + + clearNotifications() var container = document.getElementById('app-content') |