diff options
| author | Allan Wang <me@allanwang.ca> | 2017-07-17 12:38:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 12:38:42 -0700 |
| commit | e4679b1663fa78a99c6c8225e454595c6c6f4e38 (patch) | |
| tree | a777ee782207c89d6e9243399471b9ad936736d0 /app/src/main/assets/js | |
| parent | 7bf93ea74b00ab7e8ceedac2aac6ad08fdf099ab (diff) | |
| download | frost-1.3.2.tar.gz frost-1.3.2.tar.bz2 frost-1.3.2.zip | |
Fix notifications and long press for albums (#69)v1.3.2
* Allow for album images to be viewed
* Update listing info
* Web refractoring
* Test message notifications
* Fix notifications and context press
Diffstat (limited to 'app/src/main/assets/js')
| -rw-r--r-- | app/src/main/assets/js/context_a.js | 5 | ||||
| -rw-r--r-- | app/src/main/assets/js/context_a.min.js | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/src/main/assets/js/context_a.js b/app/src/main/assets/js/context_a.js index c7601764..689c6f0d 100644 --- a/app/src/main/assets/js/context_a.js +++ b/app/src/main/assets/js/context_a.js @@ -25,8 +25,9 @@ if (!window.hasOwnProperty('frost_context_a')) { if (!url) return; var text = element.parentNode.innerText; - //check if image item exists - var image = element.parentNode.querySelector('[style*="background-image: url("]'); + //check if image item exists, first in children and then in parent + var image = element.querySelector('[style*="background-image: url("]'); + if (!image) image = element.parentNode.querySelector('[style*="background-image: url("]'); if (image) { var imageUrl = window.getComputedStyle(image, null).backgroundImage.slice(5, -2); console.log('Context image', imageUrl); diff --git a/app/src/main/assets/js/context_a.min.js b/app/src/main/assets/js/context_a.min.js index 5c5f033a..97799c33 100644 --- a/app/src/main/assets/js/context_a.min.js +++ b/app/src/main/assets/js/context_a.min.js @@ -9,8 +9,9 @@ longClick=!0 "A"!==t.tagName&&(t=t.parentNode),"A"===t.tagName&&"#"!==t.getAttribute("href"))){ var o=t.getAttribute("href") ;if(!o)return -;var n=t.parentNode.innerText,r=t.parentNode.querySelector('[style*="background-image: url("]') -;if(r){ +;var n=t.parentNode.innerText,r=t.querySelector('[style*="background-image: url("]') +;if(r||(r=t.parentNode.querySelector('[style*="background-image: url("]')), +r){ var a=window.getComputedStyle(r,null).backgroundImage.slice(5,-2) ;console.log("Context image",a), "undefined"!=typeof Frost&&Frost.loadImage(a,n) |