Skip to content

Commit 2fcac95

Browse files
committed
Merge branch 'hotfix/0.9.2'
2 parents d5f2bd1 + c653d36 commit 2fcac95

3 files changed

Lines changed: 33 additions & 3 deletions

File tree

app/manifest.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "__MSG_appName__",
3-
"version": "0.9.1",
3+
"version": "0.9.2",
44
"manifest_version": 2,
55
"description": "__MSG_appDescription__",
66
"icons": {
@@ -41,7 +41,8 @@
4141
],
4242
"web_accessible_resources": [
4343
"images/cross.png",
44-
"images/check.png"
44+
"images/check.png",
45+
"options.html"
4546
],
4647
"permissions": [
4748
"declarativeContent",

app/scripts/content.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,21 @@ function onMercuryReadabilityArticleExtracted(data, overlay) {
243243
var articlePreviewHTML = contentElement.innerHTML;
244244
contentElement.innerHTML = articleContent;
245245

246+
// Add warning message if user is still using the Readability API
247+
if (options.extractionAPI === 'Readability') {
248+
var optionsUrl = chrome.extension.getURL("options.html");
249+
var warningDiv = '<div class="migrationWarning"> \
250+
<b>FullyFeedly: Readability API Migration</b><br/> \
251+
The Readability API you are currently using will stop working on the 10th of December. See the \
252+
<a href="https://medium.com/@readability/the-readability-bookmarking-service-will-shut-down-on-september-30-2016-1641cc18e02b#.e2aunrmow" \
253+
target="_blank"> official announcement</a>.<br/> \
254+
Please, go to the <a href="' + optionsUrl + '" target="_blank">options page of FullyFeedly</a> and select\
255+
the new <a href="https://mercury.postlight.com/web-parser/" target="_blank">Mercury API</a>.<br/>\
256+
Thanks a lot for using FullyFeedly :) \
257+
</div>';
258+
contentElement.innerHTML = warningDiv + contentElement.innerHTML;
259+
}
260+
246261
// Clear image styles to fix formatting of images with class/style/width information in article markup
247262
Array.prototype.slice.call(contentElement.querySelectorAll('img')).forEach(function(el) {
248263
el.removeAttribute('class');

app/styles/content.css

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
.migrationWarning {
2+
border-style: solid;
3+
border-width: 1px;
4+
border-radius: 3px;
5+
padding: 10px;
6+
border-color: #a94442;
7+
color: #333333;
8+
font-family: sans-serif;
9+
}
10+
11+
.migrationWarning b {
12+
color: #a94442 !important;
13+
}
14+
115
.showFullArticleBtn, .showArticlePreviewBtn {
216
padding: 14px 20px 14px 20px;
317
font-size: 14px;
@@ -33,4 +47,4 @@
3347

3448
.websiteCallForAction {
3549
margin-top: 10px !important;
36-
}
50+
}

0 commit comments

Comments
 (0)