Skip to content
Browse files

Fixed unworking compare marks

  • Loading branch information...
1 parent 2648431 commit fe3ca94ae4de66bff0138d3385de82cbf3b3c6d1 @robrighter committed
Showing with 14 additions and 14 deletions.
  1. +1 −1 prod-buildout/js/friendpage.js
  2. +6 −6 prod-buildout/js/site.js
  3. +1 −1 static/js/friendpage.js
  4. +6 −6 static/js/site.js
View
2 prod-buildout/js/friendpage.js
@@ -131,7 +131,7 @@ $(document).ready(function() {
$('#marknofollowbacks').bind('click', markNoFollowbacks);
$('#markfollowbacks').bind('click', markFollowbacks);
- $('#marknfans').bind('click', markFans);
+ $('#markfans').bind('click', markFans);
$('#markfollowers').bind('click', markFollowers);
$('#markfollowing').bind('click', markFollowing);
View
12 prod-buildout/js/site.js
@@ -126,10 +126,10 @@ var showError = function(error){
}
var startCompare = function(){
- if(twcompare && (twcompare.userscreenname == $('.profile #compare input').val())){
+ //if(twcompare && (twcompare.userscreenname == $('.profile #compare input').val())){
//do nothing
- }
- else{
+ //}
+ //else{
//Show the progress bar and clear out any controls that may be visible
$('#miniprogressbox').slideDown('slow');
$('#compare #controls').slideUp('slow');
@@ -147,7 +147,7 @@ var startCompare = function(){
function(error){
showMiniError(error);
});
- }
+ //}
};
var markNoFollowbacks = function(){
@@ -164,11 +164,11 @@ var markNoFollowbacks = function(){
var markFollowbacks = function(){
if(marked.followbacks){
- _.map(twcompare.followbacks, unmarkUser);
+ _.map(twcompare.reciprications, unmarkUser);
$('#markfollowbacks').removeClass('selected');
}
else{
- _.map(twcompare.followbacks, markUser);
+ _.map(twcompare.reciprications, markUser);
$('#markfollowbacks').addClass('selected');
}
marked.followbacks = !marked.followbacks;
View
2 static/js/friendpage.js
@@ -131,7 +131,7 @@ $(document).ready(function() {
$('#marknofollowbacks').bind('click', markNoFollowbacks);
$('#markfollowbacks').bind('click', markFollowbacks);
- $('#marknfans').bind('click', markFans);
+ $('#markfans').bind('click', markFans);
$('#markfollowers').bind('click', markFollowers);
$('#markfollowing').bind('click', markFollowing);
View
12 static/js/site.js
@@ -126,10 +126,10 @@ var showError = function(error){
}
var startCompare = function(){
- if(twcompare && (twcompare.userscreenname == $('.profile #compare input').val())){
+ //if(twcompare && (twcompare.userscreenname == $('.profile #compare input').val())){
//do nothing
- }
- else{
+ //}
+ //else{
//Show the progress bar and clear out any controls that may be visible
$('#miniprogressbox').slideDown('slow');
$('#compare #controls').slideUp('slow');
@@ -147,7 +147,7 @@ var startCompare = function(){
function(error){
showMiniError(error);
});
- }
+ //}
};
var markNoFollowbacks = function(){
@@ -164,11 +164,11 @@ var markNoFollowbacks = function(){
var markFollowbacks = function(){
if(marked.followbacks){
- _.map(twcompare.followbacks, unmarkUser);
+ _.map(twcompare.reciprications, unmarkUser);
$('#markfollowbacks').removeClass('selected');
}
else{
- _.map(twcompare.followbacks, markUser);
+ _.map(twcompare.reciprications, markUser);
$('#markfollowbacks').addClass('selected');
}
marked.followbacks = !marked.followbacks;

0 comments on commit fe3ca94

Please sign in to comment.
Something went wrong with that request. Please try again.