rspec seems to behave now

This commit is contained in:
2014-08-13 16:06:16 +02:00
parent 3fc7030002
commit d6e7c4998f
7 changed files with 10 additions and 25 deletions
@@ -5,9 +5,10 @@ App.User= DS.Model.extend
name: attr('string')
list: DS.belongsTo('list') # in ember scope not many to many (yet)
join_requests: DS.hasMany('join_request')
facebook_image: (-> "http://graph.facebook.com/#{@get('facebook_id')}/picture?type=square").property('facebook_id')
facebook_image_tag: (->
facebook_id = @get('facebook_id')
return '' unless facebook_id
url = "http://graph.facebook.com/#{facebook_id}/picture?type=square"
name = @get('name')
url = @get('facebook_image')
new Handlebars.SafeString "<img src=\"#{url}\" alt=\"#{name}\" title=\"#{name}\" >"
).property('facebook_image', 'name')
).property('facebook_id', 'name')
@@ -13,7 +13,7 @@ if table.active_list
/.table-action-row
a{action "editTable" table}: span.fa.fa-lg.fa-wrench
each user in table.active_list.users
img src=user.facebook_image
span= user.facebook_image_tag
if editmodedisabled
.table-settings
select
@@ -3,10 +3,6 @@ root.Qsupplier=
watch_events: ->
faye = new Faye.Client(event_host)
faye.subscribe "/supplier/#{supplier_object.id}", (e)=>
<% if Rails.env.development? %>
console.log "Event: #{e.event}"
console.log e.data
<% end %>
if(e.event == 'new_order')
if App
App.store().pushPayload(e.data)