fix jammit warnings; specs

This commit is contained in:
danielgrippi 2011-07-06 14:32:14 -07:00
parent 9765bdc391
commit 76382b074c
3 changed files with 14 additions and 14 deletions

View file

@ -33,6 +33,11 @@ class SocketsController < ApplicationController
@user ||= ((@params[:user_or_id].instance_of? User )? @params[:user_or_id] : User.find(user_id))
end
helper_method :current_user
def current_user
user
end
def all_aspects
@all_aspects ||= user.aspects
end

View file

@ -60,7 +60,7 @@ module ApplicationHelper
def person_link(person, opts={})
opts[:class] ||= ""
opts[:class] << " self" if current_user.person == person
opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
"<a href='/people/#{person.id}' class='#{opts[:class]}'>
#{h(person.name)}
</a>".html_safe

View file

@ -47,26 +47,21 @@ javascripts:
mobile:
- public/javascripts/vendor/jquery152.min.js
- public/javascripts/vendor/underscore.js
- public/javascripts/vendor/backbone-min.js
- public/javascripts/vendor/Mustache.js
- public/javascripts/mobile/app.js
- public/javascripts/mobile/helpers.js
- public/javascripts/mobile/models/*
- public/javascripts/mobile/collections/*
- public/javascripts/mobile/controllers/*
- public/javascripts/mobile/views/*
- public/javascripts/custom-mobile-scripting.js
- public/javascripts/vendor/jquery.mobile-1.0a4.js
- public/javascripts/jquery.infinitescroll-custom.js
- public/javascripts/diaspora.js
- public/javascripts/widgets/i18n.js
- public/javascripts/widgets/infinite-scroll.js
- public/javascripts/rails.js
mailchimp:
- public/javascripts/vendor/mailchimp/jquery.form.js
- public/javascripts/vendor/mailchimp/jquery.validate.js
- public/javascripts/vendor/mailchimp/jquery126.min.js
aspects:
- public/javascripts/aspect-edit.js
- public/javascripts/contact-list.js
finder:
- public/javascripts/friend-finder.js