Skip to content

Commit

Permalink
Merge branch 'release/0.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Muffo
Muffo committed Sep 9, 2014
2 parents 0dfc62b + 94da2fb commit 4f01fb3
Show file tree
Hide file tree
Showing 6 changed files with 208 additions and 39 deletions.
44 changes: 42 additions & 2 deletions app/_locales/en/messages.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,50 @@
{
"appName": {
"message": "fullyfeedly",
"message": "FullyFeedly",
"description": "The name of the application"
},
"appDescription": {
"message": "Display the full content of articles in Feedly",
"message": "Show the full content of articles in Feedly",
"description": "The description of the application"
},
"articleNotLoaded": {
"message": "Article Not Loaded",
"description": "NNotification message displayed when the article is not loaded correctly"
},
"articleNotFound": {
"message": "Article Not Found",
"description": "Notification message displayed when the article is not found"
},
"loading": {
"message": "Loading",
"description": "Notification message displayed while loading the article"
},
"done": {
"message": "Done",
"description": "Notification message displayed when the operation is completed with success"
},
"APIOverQuota": {
"message": "API Over Quota",
"description": "Notification message displayed when API exceeded free usage quota"
},
"APIBadRequest": {
"message": "API Bad Request",
"description": "Notification message displayed when the API request format is not valid"
},
"APIAuthorizationRequired": {
"message": "API Authorization Required",
"description": "Notification message displayed when API requires authorization"
},
"APIUnknownError": {
"message": "API Unknown Error",
"description": "Notification message displayed when the an unknown error occurred"
},
"APIMissingKey": {
"message": "API Missing Key",
"description": "Notification message displayed when the key for API is missing"
},
"InvalidAPI": {
"message": "Invalid API",
"description": "Notification message displayed when API is not valid"
}
}
46 changes: 46 additions & 0 deletions app/_locales/it/messages.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"appName": {
"message": "FullyFeedly",
"description": "The name of the application"
},
"appDescription": {
"message": "Mostra il contenuto completo degli articoli in Feedly",
"description": "The description of the application"
},
"articleNotLoaded": {
"message": "Articolo Non Caricato",
"description": "NNotification message displayed when the article is not loaded correctly"
},
"articleNotFound": {
"message": "Articolo Non Trovato",
"description": "Notification message displayed when the article is not found"
},
"loading": {
"message": "Caricamento",
"description": "Notification message displayed while loading the article"
},
"done": {
"message": "Fatto",
"description": "Notification message displayed when the operation is completed with success"
},
"APIOverQuota": {
"message": "API Over Quota",
"description": "Notification message displayed when API exceeded free usage quota"
},
"APIBadRequest": {
"message": "API Bad Request",
"description": "Notification message displayed when the API request format is not valid"
},
"APIAuthorizationRequired": {
"message": "API Autorizzazione Richiesta",
"description": "Notification message displayed when API requires authorization"
},
"APIUnknownError": {
"message": "API Errore Sconosciuto",
"description": "Notification message displayed when the an unknown error occurred"
},
"APIMissingKey": {
"message": "Chiave API Mancante",
"description": "Notification message displayed when the key for API is missing"
}
}
4 changes: 2 additions & 2 deletions app/libs/iosOverlay/iosOverlay.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
position: fixed;
top: 50%;
left: 50%;
width: 200px;
width: 250px;
height: 200px;
margin-left: -100px;
margin-top: -100px;
Expand All @@ -18,7 +18,7 @@
font-weight: bold;
text-align: center;
display: block;
font-size: 22px;
font-size: 20px;
position: absolute;
bottom: 30px;
left: 0;
Expand Down
7 changes: 4 additions & 3 deletions app/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "__MSG_appName__",
"version": "0.2.0",
"version": "0.3.0",
"manifest_version": 2,
"description": "__MSG_appDescription__",
"icons": {
Expand Down Expand Up @@ -33,7 +33,8 @@
"scripts/content.js"
],
"css": [
"libs/iosOverlay/iosOverlay.css"
"libs/iosOverlay/iosOverlay.css",
"styles/content.css"
]
}
],
Expand All @@ -46,7 +47,7 @@
"activeTab",
"storage",
"http://boilerpipe-web.appspot.com/*",
"http://www.readability.com/api/*"
"https://www.readability.com/api/*"
],
"options_page": "options.html"
}
110 changes: 78 additions & 32 deletions app/scripts/content.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,26 +49,24 @@ function loadingOverlay() {
document.body.appendChild(target);
var spinner = new Spinner(spinOpts).spin(target);
var overlay = iosOverlay({
text: 'Loading',
text: chrome.i18n.getMessage('loading'),
spinner: spinner
});

return overlay;
}

function genericOverlay(message, icon, duration, overlay) {

var settings = {
text: message,
icon: icon
};

if (overlay === undefined || overlay === null) {
overlay = iosOverlay({
text: message,
icon: icon
});
overlay = iosOverlay(settings);
}
else {
overlay.update({
text: message,
icon: icon
});
overlay.update(settings);
}
window.setTimeout(function() {
overlay.hide();
Expand All @@ -77,11 +75,15 @@ function genericOverlay(message, icon, duration, overlay) {
}

function successOverlay(message, overlay) {
genericOverlay(message, chrome.extension.getURL('images/check.png'), 1e3, overlay);
genericOverlay(chrome.i18n.getMessage(message),
chrome.extension.getURL('images/check.png'),
1e3, overlay);
}

function failOverlay(message, overlay) {
genericOverlay(message, chrome.extension.getURL('images/cross.png'), 2e3, overlay);
genericOverlay(chrome.i18n.getMessage(message),
chrome.extension.getURL('images/cross.png'),
2e3, overlay);
}


Expand All @@ -97,7 +99,7 @@ function onBoilerpipeArticleExtracted(data, overlay) {
// Check if the API failed to extract the text
if (data.status === null || data.status !== 'success') {
console.log('[FullyFeedly] API failed to extract the content');
failOverlay('Article not loaded', overlay);
failOverlay(chrome.i18n.getMessage('articleNotLoaded'), overlay);
return;
}

Expand All @@ -108,7 +110,7 @@ function onBoilerpipeArticleExtracted(data, overlay) {
var contentElement = document.querySelector('.content');
if (contentElement === null) {
console.log('[FullyFeedly] There is something wrong: no content element found');
failOverlay('No content', overlay);
failOverlay('contentNotFound', overlay);
return;
}

Expand All @@ -126,7 +128,7 @@ function onBoilerpipeArticleExtracted(data, overlay) {
contentElement.insertBefore(articleImage, contentElement.firstChild);
}

successOverlay('Done', overlay);
successOverlay('done', overlay);
}

function boilerpipeRequest(xhr, overlay) {
Expand All @@ -138,10 +140,10 @@ function boilerpipeRequest(xhr, overlay) {
onBoilerpipeArticleExtracted(data, overlay);
} else if (xhr.status === 503) {
console.log('[FullyFeedly] Boilerpipe API exceeded quota');
failOverlay('API over quota', overlay);
failOverlay('APIOverQuota', overlay);
} else {
console.log('[FullyFeedly] Failed to load the content of the page');
failOverlay('Article not found', overlay);
failOverlay(chrome.i18n.getMessage('articleNotFound'), overlay);
}
}
};
Expand All @@ -156,7 +158,7 @@ function onReadabilityArticleExtracted(data, overlay) {
// Check if the API failed to extract the text
if (data.content === null) {
console.log('[FullyFeedly] API failed to extract the content');
failOverlay('Article not loaded', overlay);
failOverlay('articleNotFound', overlay);
return;
}

Expand All @@ -167,7 +169,7 @@ function onReadabilityArticleExtracted(data, overlay) {
var contentElement = document.querySelector('.content');
if (contentElement === null) {
console.log('[FullyFeedly] There is something wrong: no content element found');
failOverlay('No content', overlay);
failOverlay('contentNotFound', overlay);
return;
}

Expand All @@ -179,7 +181,7 @@ function onReadabilityArticleExtracted(data, overlay) {

// Replace the preview of the article with the full text
contentElement.innerHTML = articleContent;
successOverlay('Done', overlay);
successOverlay('done', overlay);

// Put the image back at the beginning of the article
if (articleImage !== null && contentElement.querySelector('img') === null) {
Expand All @@ -198,14 +200,14 @@ function readabilityRequest(xhr, overlay) {
console.log('[FullyFeedly] Readability API Bad request: ' +
'The server could not understand your request. ' +
'Verify that request parameters (and content, if any) are valid.');
failOverlay('API bad request', overlay);
failOverlay('APIBadRequest', overlay);
} else if (xhr.status === 400) {
console.log('[FullyFeedly] Readability API Authorization Required: ' +
'Authentication failed or was not provided.');
failOverlay('API authorization required', overlay);
failOverlay('APIAuthorizationRequired', overlay);
} else {
console.log('[FullyFeedly] Readability API Unknown error');
failOverlay('API unknown error', overlay);
failOverlay('APIUnknownError', overlay);
}
}
};
Expand All @@ -214,22 +216,17 @@ function readabilityRequest(xhr, overlay) {

/**
* Performs an XMLHttpRequest to boilerpipe to get the content of the artile.
*
* @param callback Function If the response from fetching url has a
* HTTP status of 200, this function is called with a JSON decoded
* response. Otherwise, this function is called with null.
*/
function fetchPageContent() {

// Search the link of the article that is currently opened
var linkElement = document.querySelector('.websiteCallForAction');
if (linkElement === null) {
console.log('[FullyFeedly] Link to article not found');
failOverlay('Article not found');
failOverlay('articleNotFound');
return;
}


// Get the link and convert it for usage as parameter in the GET request
var pageUrl = linkElement.getAttribute('href');
var encodedPageUrl = encodeURIComponent(pageUrl);
Expand All @@ -241,6 +238,7 @@ function fetchPageContent() {
var xhr = new XMLHttpRequest();
var url = '';

// Select the API to use to extract the article
if (options.extractionAPI === 'Boilerpipe') {
// Prepare the request to Boilerpipe
url = 'http://boilerpipe-web.appspot.com/extract?url=' +
Expand All @@ -252,22 +250,26 @@ function fetchPageContent() {
else if (options.extractionAPI === 'Readability') {
// Check if the key is set
if (options.readabilityAPIKey === '') {
failOverlay('Missing API Key', overlay);
failOverlay('APIMissingKey', overlay);
return;
}

// Prepare the request to Readability
url = 'http://www.readability.com/api/content/v1/parser?url=' +
url = 'https://www.readability.com/api/content/v1/parser?url=' +
encodedPageUrl + '&token=' + options.readabilityAPIKey;

xhr.onreadystatechange = readabilityRequest(xhr, overlay);
}
else {
failOverlay('InvalidAPI', overlay);
return;
}
xhr.open('GET', url, true);
xhr.send();
}


/* Listen for requests */
// Listen for requests
chrome.runtime.onMessage.addListener(function(msg, sender, sendResponse) {
// If the received message has the expected format...
if (msg.text && (msg.text === 'extract_article')) {
Expand All @@ -277,4 +279,48 @@ chrome.runtime.onMessage.addListener(function(msg, sender, sendResponse) {
}
});

/* ================ DOM Observer =============== */

// Define a generic DOM Observer
var observeDOM = (function() {

var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
return function(obj, callback) {
// Define a new observer
var obs = new MutationObserver(function(mutations) {
if (mutations[0].addedNodes.length) {
callback(mutations);
}
});
// Have the observer observe foo for changes in children
obs.observe(obj, { childList:true, subtree:true });
};
})();

// This is used to add the button to the article when its
// preview is opened in Feedly
observeDOM(document.getElementById('box'), function() {
// Check if the button is already there
if (document.querySelector('.loadArticleBtn') !== null) {
return;
}

// Search the button to open the website and the container element
var openWebsiteBtn = document.querySelector('.websiteCallForAction');
var entryElement = document.querySelector('.u100entry');

if (openWebsiteBtn !== null && entryElement !== null) {
// Create a new button used to load the article
var loadArticleBtn = openWebsiteBtn.cloneNode();
loadArticleBtn.className = 'loadArticleBtn';
loadArticleBtn.innerText = 'Load Full Article';

// Remove the link and assign a different action
loadArticleBtn.removeAttribute('href');
loadArticleBtn.onclick = fetchPageContent;

// Add the new button to the page
entryElement.insertBefore(loadArticleBtn, openWebsiteBtn);
return;
}
});
Loading

0 comments on commit 4f01fb3

Please sign in to comment.