diff options
| author | Anqi Xu | 2012-06-23 23:38:22 -0400 |
|---|---|---|
| committer | Anqi Xu | 2012-06-23 23:38:22 -0400 |
| commit | 44123e6c3f158560bf1c067c9abec37135ad2841 (patch) | |
| tree | 18b3261f8136c1ac6f15089bb81a24b2b8489565 | |
| parent | b8b6d249d2d28b443627ef5c89de43907feb311b (diff) | |
| parent | f10b81baaaad0a03e30c4c758c05401fcd101fbf (diff) | |
| download | LikeFeed-44123e6c3f158560bf1c067c9abec37135ad2841.tar.bz2 | |
Merge branch 'master' of https://github.com/teddywing/LikeFeed
| -rw-r--r-- | .DS_Store | bin | 6148 -> 0 bytes | |||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Resources/friendship/ui/ApplicationWindow.js | 1 | ||||
| -rw-r--r-- | Resources/friendship/ui/LikeList.js | 2 |
4 files changed, 3 insertions, 1 deletions
diff --git a/.DS_Store b/.DS_Store Binary files differdeleted file mode 100644 index 5008ddf..0000000 --- a/.DS_Store +++ /dev/null @@ -1,2 +1,3 @@ tmp build +.DS_Store diff --git a/Resources/friendship/ui/ApplicationWindow.js b/Resources/friendship/ui/ApplicationWindow.js index 14444a2..5243bd3 100644 --- a/Resources/friendship/ui/ApplicationWindow.js +++ b/Resources/friendship/ui/ApplicationWindow.js @@ -1,6 +1,7 @@ (function() { fs.ui.createApplicationTabGroup = function() { var tab_group = Ti.UI.createTabGroup(); + Ti.UI.currentTabGroup = tab_group; var login_button = Ti.Facebook.createLoginButton({ top: 50, diff --git a/Resources/friendship/ui/LikeList.js b/Resources/friendship/ui/LikeList.js index 102b6f7..ce01096 100644 --- a/Resources/friendship/ui/LikeList.js +++ b/Resources/friendship/ui/LikeList.js @@ -21,7 +21,7 @@ */ var profile_icon = Ti.UI.createImageView({ - url:key.pic_square, + image:key.pic_square, width:50, height:50, left:0, |