some reverts

This commit is contained in:
Jeena 2014-02-21 11:35:58 +01:00
parent 5d3be078b4
commit 01cb207b65
4 changed files with 20 additions and 31 deletions

View file

@ -7,16 +7,6 @@ function App() {
if(!color) color = "red";
this.setColor(color);
this.fontChange();
var _this = this;
window.onkeydown = function(e) {
if(e.keyCode == 39) {
_this.showNext();
} else if(e.keyCode == 37) {
_this.showPrevious();
}
}
};
App.prototype.authenticate = function() {
@ -27,12 +17,9 @@ App.prototype.after_login = function(backend) {
/*
var request = window.navigator.mozApps.getSelf();
request.onsuccess = function() {
if(request.result) {
$("#version").innerHTML = request.result.manifest.version;
}
$("#version").innerHTML = request.result.manifest.version;
}*/
var _this = this;
window.onhashchange = function(e) {
@ -289,8 +276,8 @@ App.prototype.showFull = function(article, slide_back) {
$(page_id + " .date").innerHTML = (new Date(parseInt(article.updated, 10) * 1000)).toLocaleString();
var title = $(page_id + " .link");
title.innerHTML = article.link;
var title = $(page_id + " .title");
title.innerHTML = article.title;
title.href = article.link;
$(page_id + " .feed_title").innerHTML = article.feed_title;
@ -299,10 +286,7 @@ App.prototype.showFull = function(article, slide_back) {
if(article.author && article.author.length > 0)
$(page_id + " .author").innerHTML = "– " + article.author;
var content = article.content
if(content.replace(/^\s+|\s+$/g,'').length == 0) content = article.title;
$(page_id + " .article").innerHTML = content.urlify();
$(page_id + " .article").innerHTML = article.content;
$$(page_id + " .article a").forEach(function(o, i) {
o.target = "_blank";
});

View file

@ -46,7 +46,7 @@ Pond.prototype.doOperation = function(method, operation, new_options, callback)
body = a.join("&");
}
var xhr = new XMLHttpRequest();
var xhr = new XMLHttpRequest({mozSystem: true});
xhr.onreadystatechange = function() {
if(xhr.readyState == 4) {
if(xhr.status == 200) {
@ -76,7 +76,7 @@ Pond.prototype.reload = function(callback) {
Pond.prototype.getUnreadFeeds = function(callback, skip) {
var options = {
status: "unread",
status: "all",
limit: 100
};
@ -134,6 +134,8 @@ Pond.prototype.normalizeArticle = function(article) {
var timestamp = new Date(article.published_at).getTime() / 1000;
console.log(article.read)
return {
id: article.id,
guid_hash: article.url + article.id,
@ -207,7 +209,7 @@ Pond.login = function(server_url, user, password, callback) {
var password_hash = md5(user + ':' + password)
var options = "username=" + user.toLowerCase() + "&" + "password=" + password_hash;
var xhr = new XMLHttpRequest();
var xhr = new XMLHttpRequest({mozSystem: true});
xhr.onreadystatechange = function() {
if(xhr.readyState == 4) {
if(xhr.status == 201) {