OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix filer
[pettanr/pettanr.git]
/
app
/
assets
/
javascripts
/
locmare
/
filer
/
body
/
file_body
/
file_item
/
caption
/
default
/
face
/
method.js.coffee
diff --git
a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee
b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee
index
76b023e
..
030d596
100644
(file)
--- a/
app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee
+++ b/
app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee
@@
-4,7
+4,11
@@
class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo
super(options)
\r
\r
render: () ->
\r
- this.$el.html(@face())
\r
+ if Pettanr.is_a_string(@face())
\r
+ this.$el.html(@face())
\r
+ else
\r
+ this.$el.html(@face().render().el)
\r
+
\r
this
\r
\r
@template_file_name: () ->
\r