From 6b764fcd39dae6889d586faf59916f7ca73f866b Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 12 Aug 2015 18:42:29 +0200 Subject: [PATCH] Yet better ember2 compliance --- .../supplier/app/components/suppliers-switcher.js.coffee | 3 ++- .../supplier/app/controllers/index_controller.js.coffee | 8 ++++---- .../app/controllers/lists_index_controller.js.coffee | 2 +- .../supplier/app/controllers/menu_controller.js.coffee | 2 +- .../app/controllers/orders_display_controller.js.coffee | 2 +- .../supplier/app/templates/global/_top_menu.emblem | 2 +- .../javascripts/supplier/app/templates/my_account.emblem | 2 +- .../javascripts/supplier/app/templates/settings.emblem | 4 ++-- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/supplier/app/components/suppliers-switcher.js.coffee b/app/assets/javascripts/supplier/app/components/suppliers-switcher.js.coffee index 667d1dd7..b3aabf39 100644 --- a/app/assets/javascripts/supplier/app/components/suppliers-switcher.js.coffee +++ b/app/assets/javascripts/supplier/app/components/suppliers-switcher.js.coffee @@ -1,7 +1,8 @@ App.SuppliersSwitcherComponent = Ember.Component.extend classNames: ['suppliers-switcher-container'] suppliers: (-> @get('targetObject.store').peekAll 'supplier').property() - other_suppliers: ( -> @get('suppliers').rejectBy 'id', @get('globals.current_supplier.id')).property('suppliers.@each') + other_suppliers: Ember.computed 'suppliers.[]', + -> @get('suppliers').rejectBy 'id', @get('globals.current_supplier.id') actions: switchTo: (locale)-> setLocale locale diff --git a/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee index 04d877b0..5641b8a4 100644 --- a/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee @@ -22,12 +22,12 @@ App.IndexController = Ember.Controller.extend orders.sortBy('created_at') # Not reversed, oldest on top, start with oldest order first :-) Customer happyness ).property('orders.@each.state', 'active_section.id') - show_lists_table: Ember.computed 'show_lists', 'active_lists.@each', -> + show_lists_table: Ember.computed 'show_lists', 'active_lists.[]', -> @get('show_lists') and @get('active_lists.length') - show_orders_table: Ember.computed 'show_orders', 'active_orders.@each', -> + show_orders_table: Ember.computed 'show_orders', 'active_orders.[]', -> @get('show_orders') and @get('active_orders.length') - list_number_info: (-> " (#{@get('active_lists.length')})").property('active_lists.@each') - order_number_info: (-> " (#{@get('active_orders.length')})").property('active_orders.@each') + list_number_info: (-> " (#{@get('active_lists.length')})").property('active_lists.[]') + order_number_info: (-> " (#{@get('active_orders.length')})").property('active_orders.[]') actions: toggleDashboardLists: -> @set 'show_lists', !@get('show_lists') diff --git a/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee index c5a7dcfe..7056ab86 100644 --- a/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee @@ -17,4 +17,4 @@ App.ListsIndexController = Ember.Controller.extend sorted_lists: (-> @get('lists').sortBy('created_at').reverseObjects() - ).property('lists.@each') + ).property('lists.[]') diff --git a/app/assets/javascripts/supplier/app/controllers/menu_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/menu_controller.js.coffee index fe88db43..7b36db94 100644 --- a/app/assets/javascripts/supplier/app/controllers/menu_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/menu_controller.js.coffee @@ -11,7 +11,7 @@ App.MenuController = Ember.Controller.extend list = list.filter (r) -> r.get('full_day') or (filter_minute >= r.get('start_from') and filter_minute <= r.get('end_on')) list.sortBy('position') - ).property('product_categories.@each', 'product_categories.@each.position', 'filter.day', 'filter.minute_of_day') + ).property('product_categories.[]', 'product_categories.@each.position', 'filter.day', 'filter.minute_of_day') product_code_filter_placeholder: t('product.code_filter.placeholder') actions: editProductCategory: (product_category)-> diff --git a/app/assets/javascripts/supplier/app/controllers/orders_display_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/orders_display_controller.js.coffee index 4ca776d7..21a2b69d 100644 --- a/app/assets/javascripts/supplier/app/controllers/orders_display_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/orders_display_controller.js.coffee @@ -2,7 +2,7 @@ App.OrdersDisplayController = Ember.Controller.extend needs: ['application'] active_section: null sections: (-> @store.all('section') ).property() - orders: Ember.computed 'model.@each', 'active_section.id', -> + orders: Ember.computed 'model.[]', 'active_section.id', -> orders = @get('model').filterBy('needs_supplier_attention') orders = orders.filterBy('section.id', id) if id = @get('active_section.id') orders.sortBy('created_at') # Not reversed, oldest on top, start with oldest order first :-) Customer happyness diff --git a/app/assets/javascripts/supplier/app/templates/global/_top_menu.emblem b/app/assets/javascripts/supplier/app/templates/global/_top_menu.emblem index 854f582e..19c85d96 100644 --- a/app/assets/javascripts/supplier/app/templates/global/_top_menu.emblem +++ b/app/assets/javascripts/supplier/app/templates/global/_top_menu.emblem @@ -17,7 +17,7 @@ header.top-menu = t 'models.plural.employee' = link-to "schedule" class="top-menu-schedule" = t 'top_menu.schedule' - = dropdown-link gravatar=globals.current_employee.email classNames="current-employee-nav" + = dropdown-link gravatar=globals.current_employee.email class="current-employee-nav" ul li li= link-to 'my_account': span.current-employee-my-account-icon= t 'current_employee.my_account.link' diff --git a/app/assets/javascripts/supplier/app/templates/my_account.emblem b/app/assets/javascripts/supplier/app/templates/my_account.emblem index 4dd4357d..14b6ee48 100644 --- a/app/assets/javascripts/supplier/app/templates/my_account.emblem +++ b/app/assets/javascripts/supplier/app/templates/my_account.emblem @@ -1,6 +1,6 @@ .row: .small-12.columns: h2=t 'current_employee.my_account.title' .form-row .form-label: label=t 'attributes.employee.email' - .form-field= input value=globals.current_employee.email type="email" classNames="supplier-email" disabled=true + .form-field= input value=globals.current_employee.email type="email" class="supplier-email" disabled=true .row: .small-12.columns= language-switcher .row: .small-12.columns= suppliers-switcher diff --git a/app/assets/javascripts/supplier/app/templates/settings.emblem b/app/assets/javascripts/supplier/app/templates/settings.emblem index ec8aa252..a4938e22 100644 --- a/app/assets/javascripts/supplier/app/templates/settings.emblem +++ b/app/assets/javascripts/supplier/app/templates/settings.emblem @@ -1,10 +1,10 @@ .row: .small-12.columns: h2=t 'settings.title' .form-row .form-label: label=t 'attributes.supplier.name' - .form-field= input value=supplier.name classNames="supplier-name" + .form-field= input type="text" value=supplier.name class="supplier-name" .form-row .form-label: label=t 'attributes.supplier.email' - .form-field= input value=supplier.email type="email" classNames="supplier-email" + .form-field= input value=supplier.email type="email" class="supplier-email" /input.location_picker name="location" type="text" valueBinding="location" /.form-row .location_picker_map