From a1474e934a6763bf445c6eb4e1882b799e57eb37 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Wed, 18 Feb 2015 23:42:56 +0100
Subject: [PATCH] improvements

---
 .../components/edit_currency_component.js.coffee  |  3 +++
 .../supplier/app/models/product.js.coffee         | 15 +++++++++------
 .../app/templates/components/edit-currency.emblem |  2 +-
 .../app/templates/components/menu-product.emblem  |  4 ++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/supplier/app/components/edit_currency_component.js.coffee b/app/assets/javascripts/supplier/app/components/edit_currency_component.js.coffee
index 47af963d..cece9719 100644
--- a/app/assets/javascripts/supplier/app/components/edit_currency_component.js.coffee
+++ b/app/assets/javascripts/supplier/app/components/edit_currency_component.js.coffee
@@ -28,6 +28,9 @@ App.EditCurrencyComponent = Ember.Component.extend
     return_value = return_value.toFixed(2) if typeof return_value is 'number'
     return_value
 
+  actions:
+    action: ->
+      @sendAction('action') if @action
   #didInsertElement: ->
     #@addObserver "model.#{@attribute}", (attribute)=>
       #if value = @get("model.#{@attribute}")
diff --git a/app/assets/javascripts/supplier/app/models/product.js.coffee b/app/assets/javascripts/supplier/app/models/product.js.coffee
index 87dd0add..67a21bb8 100644
--- a/app/assets/javascripts/supplier/app/models/product.js.coffee
+++ b/app/assets/javascripts/supplier/app/models/product.js.coffee
@@ -1,5 +1,5 @@
 attr = DS.attr
-App.Product = DS.Model.extend
+App.Product = DS.Model.extend Ember.Validations.Mixin,
   name: attr 'string'
   price: attr 'number'
   code: attr 'string'
@@ -17,8 +17,11 @@ App.Product = DS.Model.extend
     image
   ).property('image')
 
-  isValid: (->
-    return false unless price = @get('price')
-    return false unless "#{price}".match(/^[+-]?\d+(\.?\d?\d)?$/)
-    true
-  ).property('price')
+  #isValid: (->
+    #return false unless price = @get('price')
+    #return false unless "#{price}".match(/^[+-]?\d+(\.?\d?\d)?$/)
+    #true
+  #).property('price')
+  validations:
+    name: {presence: true}
+    price: {format: /^[+-]?\d+(\.?\d?\d)?$/}
diff --git a/app/assets/javascripts/supplier/app/templates/components/edit-currency.emblem b/app/assets/javascripts/supplier/app/templates/components/edit-currency.emblem
index c148420f..82caf59e 100644
--- a/app/assets/javascripts/supplier/app/templates/components/edit-currency.emblem
+++ b/app/assets/javascripts/supplier/app/templates/components/edit-currency.emblem
@@ -1,3 +1,3 @@
 .large-2.columns: label.prefix= currencySymbol
-.large-4.columns.end= input valueBinding="inputValue" placeholder=placeholder
+.large-4.columns.end= input valueBinding="inputValue" placeholder=placeholder action="action"
 
diff --git a/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem b/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem
index cd0596f0..fdcd0b03 100644
--- a/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem
+++ b/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem
@@ -1,10 +1,10 @@
 if editMode
   .row
     .small-3.columns.name
-      = input value=product.name placeholder=namePlaceholder
+      = input value=product.name placeholder=namePlaceholder action="save"
       = errors product.errors.name
     .small-3.columns.price
-      = edit-currency value=product.price validatePresence=true
+      = edit-currency value=product.price validatePresence=true action="save"
       = errors product.errors.price
     .small-3.columns.code= input value=product.code placeholder=codePlaceholder
     .small-3.columns.actions