User style fixes for fixed top menu and list cached supplier loading
This commit is contained in:
@@ -10,11 +10,13 @@ App.List = DS.Model.extend
|
||||
extended_version: attr('boolean')
|
||||
supplier_orders_in_process_count: attr('number')
|
||||
supplier_orders_placed_count: attr('number')
|
||||
cached_supplier_name: attr('string')
|
||||
|
||||
supplier: DS.belongsTo('supplier')
|
||||
table: DS.belongsTo('table')
|
||||
join_requests: DS.hasMany('join_request')
|
||||
users: DS.hasMany('user')
|
||||
supplier_name: (-> @get('cached_supplier_name') or @get('supplier.name')).property('cached_supplier_name', 'supplier.name')
|
||||
|
||||
is_extended_version: ->
|
||||
@get('extended_version')
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
App.ResetScroll = Ember.Mixin.create
|
||||
activate: ->
|
||||
@_super()
|
||||
window.scrollTo 0, 0
|
||||
@@ -1,4 +1,4 @@
|
||||
App.ActiveListRoute = Ember.Route.extend {}
|
||||
App.ActiveListRoute = Ember.Route.extend App.ResetScroll
|
||||
#model: ->
|
||||
#@get('controllers.application.list')
|
||||
#afterModel: ->
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
App.IndexRoute = Ember.Route.extend App.ResetScroll
|
||||
@@ -1,4 +1,4 @@
|
||||
App.ListRoute = Ember.Route.extend
|
||||
App.ListRoute = Ember.Route.extend App.ResetScroll,
|
||||
model: (options)->
|
||||
@store.find 'list', options.list_id
|
||||
afterModel: (model)->
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
App.ListsRoute = Ember.Route.extend
|
||||
App.ListsRoute = Ember.Route.extend App.ResetScroll,
|
||||
model: ->
|
||||
@store.find 'list'
|
||||
setupController: (controller, model)->
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
span.created_at=time list.created_at
|
||||
span.price.currency= currency list.price
|
||||
span.name= list.supplier.name
|
||||
span.name= list.supplier_name
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
App.ApplicationView = Ember.View.extend
|
||||
didInsertElement: ->
|
||||
$('.main-section').css 'min-height', ($(window).height() - $('.tab-bar:first').outerHeight())
|
||||
$('.main-section').css 'min-height', $(window).height() - $('.top-menu').outerHeight()
|
||||
|
||||
$('.toggle-side-menu,.side-menu').click ->
|
||||
menu = $('aside.side-menu')
|
||||
|
||||
Reference in New Issue
Block a user