From: yasushiito <yas@pen-chan.jp>
Date: Fri, 8 Aug 2014 07:52:22 +0000 (+0900)
Subject: fix js filer
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=334a0994d2177cad8d9cae7e963b6547498e3fa3

fix js filer
---

diff --git a/app/assets/javascripts/locmare/filer/body/file_body.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body.js.coffee
index ac0b8959..dee82933 100644
--- a/app/assets/javascripts/locmare/filer/body/file_body.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body.js.coffee
@@ -15,9 +15,8 @@ class Locmare.FilerModule.BodyModule.FileBody extends Backbone.View
     _.each @collection().models, (item) ->
       c = _this.file_item_class()
       file_item = new c({'file_body': _this, 'item': item})
-      args = {'file_item': file_item}
-      template = _.template($("#" + file_item.template_name()).html())
-      _this.$el.append(template(args))
+      h = file_item.render().el.outerHTML
+      _this.$el.append(h)
     this
   
   file_item_class: () ->
diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee
index 65d87494..6c3aa0b1 100644
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee
@@ -13,7 +13,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItem extends Backbone.Vi
     @el.className = 'filer-item filer-item-' + @item.item_name()
   
   render: () ->
-    args = {'header': this}
+    args = {'file_item': this}
     template = _.template($("#" + @template_name()).html())
     this.$el.html(template(args))
     this
diff --git a/app/assets/javascripts/locmare/filer/body/file_header.js.coffee b/app/assets/javascripts/locmare/filer/body/file_header.js.coffee
index 6007bde7..722a7bef 100644
--- a/app/assets/javascripts/locmare/filer/body/file_header.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_header.js.coffee
@@ -1,7 +1,6 @@
 class Locmare.FilerModule.BodyModule.FileHeader extends Backbone.View
   tagName: 'li'
   id: ''
-  class: 'filer-head filer-head- file_header.item_name'
   
   initialize: (options) ->
     @body = options.body
@@ -35,6 +34,7 @@ class Locmare.FilerModule.BodyModule.FileHeader extends Backbone.View
     else
       Locmare.FilerModule.BodyModule.FileHeaderModule.None
     @edit = new c({'file_header': this, 'column_name': 'edit'})
+    @el.className = 'filer-head filer-head-' + @item_name()
   
   render: () ->
     args = {'file_header': this}
diff --git a/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee
index 0bf81335..d8cd7bc6 100644
--- a/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee
@@ -1,8 +1,10 @@
 class Locmare.FilerModule.BodyModule.FileHeaderModule.Base extends Backbone.View
+  tagName: 'div'
   
   initialize: (options) ->
     @file_header = options.file_header
     @column_name = options.column_name
+    @el.className = 'filer-head-' + @column_name
   
   render: () ->
     args = {'header_column': this}
diff --git a/app/assets/javascripts/locmare/filer/body/file_header/show.js.coffee b/app/assets/javascripts/locmare/filer/body/file_header/show.js.coffee
index 9c9000ef..bf1fd639 100644
--- a/app/assets/javascripts/locmare/filer/body/file_header/show.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_header/show.js.coffee
@@ -1,7 +1,4 @@
 class Locmare.FilerModule.BodyModule.FileHeaderModule.Show extends Locmare.FilerModule.BodyModule.FileHeaderModule.Base
-  tagName: 'li'
-  id: ''
-  class: 'filer-head filer-head- file_header.item_name'
   
   template_file_name: () ->
     "show"
diff --git a/app/views/top/ap.html.erb b/app/views/top/ap.html.erb
index 84dc66d2..77c2bf4a 100644
--- a/app/views/top/ap.html.erb
+++ b/app/views/top/ap.html.erb
@@ -30,12 +30,12 @@
   </div>
 </script>
 <script type="text/template" id="templates-filer-file_header">
-  <&= file_header.symbol.render().el.innerHTML &>
-  <&= file_header.caption.render().el.innerHTML &>
-  <&= file_header.summary.render().el.innerHTML &>
-  <&= file_header.icon.render().el.innerHTML &>
-  <&= file_header.date.render().el.innerHTML &>
-  <&= file_header.edit.render().el.innerHTML &>
+  <&= file_header.symbol.render().el.outerHTML &>
+  <&= file_header.caption.render().el.outerHTML &>
+  <&= file_header.summary.render().el.outerHTML &>
+  <&= file_header.icon.render().el.outerHTML &>
+  <&= file_header.date.render().el.outerHTML &>
+  <&= file_header.edit.render().el.outerHTML &>
 </script>
 <script type="text/template" id="templates-filer-file_body">
   <&= file_body.file_item.render().el.outerHTML &>