Merge branch 'hotfix/0.9.2'

Muffo · Nov 19, 2016 · 2fcac95 · 2fcac95
2 parents d5f2bd1 + c653d36
commit 2fcac95
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/app/manifest.json b/app/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "__MSG_appName__",
-    "version": "0.9.1",
+    "version": "0.9.2",
     "manifest_version": 2,
     "description": "__MSG_appDescription__",
     "icons": {
@@ -41,7 +41,8 @@
     ],
     "web_accessible_resources": [
         "images/cross.png",
-        "images/check.png"
+        "images/check.png",
+        "options.html"
     ],
     "permissions": [
         "declarativeContent",

diff --git a/app/scripts/content.js b/app/scripts/content.js
@@ -243,6 +243,21 @@ function onMercuryReadabilityArticleExtracted(data, overlay) {
     var articlePreviewHTML = contentElement.innerHTML;
     contentElement.innerHTML = articleContent;
 
+    // Add warning message if user is still using the Readability API
+    if (options.extractionAPI === 'Readability') {
+        var optionsUrl = chrome.extension.getURL("options.html");
+        var warningDiv = '<div class="migrationWarning"> \
+            <b>FullyFeedly: Readability API Migration</b><br/> \
+            The Readability API you are currently using will stop working on the 10th of December. See the \
+            <a href="https://medium.com/@readability/the-readability-bookmarking-service-will-shut-down-on-september-30-2016-1641cc18e02b#.e2aunrmow" \
+            target="_blank"> official announcement</a>.<br/> \
+            Please, go to the <a href="' + optionsUrl + '" target="_blank">options page of FullyFeedly</a> and select\
+            the new <a href="https://mercury.postlight.com/web-parser/" target="_blank">Mercury API</a>.<br/>\
+            Thanks a lot for using FullyFeedly :) \
+        </div>';
+        contentElement.innerHTML = warningDiv + contentElement.innerHTML;
+    }
+
     // Clear image styles to fix formatting of images with class/style/width information in article markup
     Array.prototype.slice.call(contentElement.querySelectorAll('img')).forEach(function(el) {
         el.removeAttribute('class');

diff --git a/app/styles/content.css b/app/styles/content.css
@@ -1,3 +1,17 @@
+.migrationWarning {
+    border-style: solid;
+    border-width: 1px;
+    border-radius: 3px;
+    padding: 10px;
+    border-color: #a94442;
+    color: #333333;
+    font-family: sans-serif;
+}
+
+.migrationWarning b {
+    color: #a94442 !important;
+}
+
 .showFullArticleBtn, .showArticlePreviewBtn {
 	padding: 14px 20px 14px 20px;
 	font-size: 14px;
@@ -33,4 +47,4 @@
 
 .websiteCallForAction {
 	margin-top: 10px !important;
-}
+}