Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[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 303398a..254d97d 100644 (file)
--- a/app/assets/javascripts/models/ground_color.js.coffee
+++ b/app/assets/javascripts/models/ground_color.js.coffee
@@ -1,4 +1,6 @@
 class Pettanr.GroundColor extends Peta.Element\r
+  url: '/ground_colors/'\r
+  \r
   @singular: () ->\r
     'GroundColor'\r
   \r
@@ -13,59 +15,13 @@ class Pettanr.GroundColor extends Peta.Element
   @has_picture: () ->\r
     false\r
   \r
-  div_offset: () ->\r
-    if @get('xy')\r
-      @get('xy')\r
-    else\r
-      0\r
-  \r
-  div_size: () ->\r
-    if @get('wh')\r
-      @get('wh')\r
-    else\r
-      100 - @div_offset()\r
-  \r
-  div_x: () ->\r
-    if @get('orientation') == 0\r
-      0\r
-    else\r
-      @div_offset()\r
-  \r
-  div_y: () ->\r
-    if @get('orientation') == 0\r
-      @div_offset()\r
-    else\r
-      0\r
-  \r
-  div_width: () ->\r
-    if @get('orientation') == 0\r
-      100\r
-    else\r
-      @div_size()\r
-  \r
-  div_height: () ->\r
-    if @get('orientation') == 0\r
-      @div_size()\r
-    else\r
-      100\r
+  panel: (options = {}) ->\r
+    new Pettanr.Panel({id: @get('panel_id')}, options)\r
   \r
-  style: (spot = null, opacity = 20) ->\r
-    r = {\r
-      position: 'absolute', \r
-      'z-index': @get('z'), \r
-      top: Pettanr.to_s(@div_y()) + '%', \r
-      left: Pettanr.to_s(@div_x()) + '%', \r
-      width: Pettanr.to_s(@div_width()) + '%', \r
-      height: Pettanr.to_s(@div_height()) + '%', \r
-      'background-color': '#' + ('000000' + Pettanr.to_s(@get('code'))).slice(-6)\r
-    }\r
-    @merge_opacity(r, opacity) if spot and spot != this\r
-    r\r
+  element_face: () ->\r
+    new Pettanr.Views.GroundColor.ElementFace({element: this})\r
   \r
   initialize: () ->\r
     if @id\r
       @url = @url + @id\r
   \r
-class Pettanr.GroundColor.Collection extends Backbone.Collection\r
-  model: Pettanr.GroundColor\r
-  url: '/ground_colors'\r