merge:

[pettanr/pettanr.git] / app / assets / javascripts / models / ground_color.js.coffee

diff --git a/app/assets/javascripts/models/ground_color.js.coffee b/app/assets/javascripts/models/ground_color.js.coffee
index 3643f1f..bc36e98 100644 (file)
--- a/app/assets/javascripts/models/ground_color.js.coffee
+++ b/app/assets/javascripts/models/ground_color.js.coffee
@@ -15,10 +15,17 @@ class Pettanr.GroundColor extends Peta.Element
   @has_picture: () ->\r
     false\r
   \r
+  @pick_item_name: () ->\r
+    ''\r
+  \r
   panel: () ->\r
-    new Pettanr.Panel({id: @get('panel_id')})\r
+    new Pettanr.Cache.Retriever(Pettanr.Panel, @get('panel_id'))\r
+  \r
+  element_face: () ->\r
+    new Pettanr.Views.GroundColor.ElementFace({element: this})\r
   \r
-  initialize: () ->\r
+  initialize: (attr, options) ->\r
+    super(attr, options)\r
     if @id\r
       @url = @url + @id\r
   \r