jeena/Bungloo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'master' of github.com:jeena/Tentia

Browse source
This commit is contained in:
Jeena Paradies 2013-02-03 22:04:32 +01:00
commit a2e41efd82
5 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.DS_Store vendored
View file

Binary file not shown.

1
.gitignore vendored
View file

@ -2,7 +2,6 @@ Mac/build/
Mac/Tentia.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate Mac/Tentia.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate
dsa_priv.pem dsa_priv.pem
*.pyc *.pyc
Mac/.DS_Store
build build
.DS_Store .DS_Store
*~ *~

2
Mac/Tentia-Info.plist
View file

@ -59,7 +59,7 @@
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.6.2</string> <string>0.6.2</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.lifestyle</string> <string>public.app-category.social-networking</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string> <string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>

4
WebKit/index.html
View file

@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html>
<head> <head>
<title>Tentia</title> <title>Tentia</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

23
WebKit/scripts/controller/Profile.js
View file

@ -292,7 +292,15 @@ function(HostApp, Core, Paths, URI) {
_this.populate(_this.profile_template.followed, resp.responseText); _this.populate(_this.profile_template.followed, resp.responseText);
}, null, false); }, null, false);
Paths.getURL(URI(root_url + "/posts/count").toString(), "GET", function(resp) { var url = URI(root_url + "/posts/count");
var post_types = [
"https://tent.io/types/post/repost/v0.1.0",
"https://tent.io/types/post/status/v0.1.0",
"https://tent.io/types/post/photo/v0.1.0"
];
url.addSearch("post_types", post_types.join(","));
Paths.getURL(url.toString(), "GET", function(resp) {
_this.populate(_this.profile_template.posts, resp.responseText); _this.populate(_this.profile_template.posts, resp.responseText);
}, null, false); }, null, false);
@ -308,7 +316,6 @@ function(HostApp, Core, Paths, URI) {
var post_types = [ var post_types = [
"https://tent.io/types/post/repost/v0.1.0", "https://tent.io/types/post/repost/v0.1.0",
"https://tent.io/types/post/status/v0.1.0", "https://tent.io/types/post/status/v0.1.0",
"https://tent.io/types/post/delete/v0.1.0",
"https://tent.io/types/post/photo/v0.1.0" "https://tent.io/types/post/photo/v0.1.0"
]; ];
url.addSearch("post_types", post_types.join(",")); url.addSearch("post_types", post_types.join(","));
@ -322,6 +329,7 @@ function(HostApp, Core, Paths, URI) {
}, null, false); }, null, false);
} }
Profile.prototype.newStatus = function(statuses) { Profile.prototype.newStatus = function(statuses) {
if(statuses != null && statuses.length > 0) { if(statuses != null && statuses.length > 0) {
for(var i = statuses.length-1, c=0; i>=c; --i) { for(var i = statuses.length-1, c=0; i>=c; --i) {
@ -494,7 +502,18 @@ function(HostApp, Core, Paths, URI) {
entity_tag.href = profile.entity; entity_tag.href = profile.entity;
entity_tag.title = profile.entity; entity_tag.title = profile.entity;
var new_line = document.createElement("br");
var follows_since = document.createTextNode("follows since ");
var follows_since_time = document.createElement("span");
follows_since_time.innerText = this.ISODateString(new Date(profile.created_at * 1000));
follows_since_time.title = follows_since_time.innerText;
follows_since_time.className = "timeago";
jQuery(follows_since_time).timeago();
p.appendChild(entity_tag); p.appendChild(entity_tag);
p.appendChild(new_line);
p.appendChild(follows_since);
p.appendChild(follows_since_time);
div.appendChild(p); div.appendChild(p);
var profile_callback = function(p) { var profile_callback = function(p) {