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
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
[pettanr/pettanr.git]
/
app
/
assets
/
javascripts
/
models
/
ground_picture.js.coffee
diff --git
a/app/assets/javascripts/models/ground_picture.js.coffee
b/app/assets/javascripts/models/ground_picture.js.coffee
index
e4e2fb9
..
a699cce
100644
(file)
--- a/
app/assets/javascripts/models/ground_picture.js.coffee
+++ b/
app/assets/javascripts/models/ground_picture.js.coffee
@@
-17,8
+17,8
@@
class Pettanr.GroundPicture extends Peta.Element
@repeat_texts: () ->
\r
['repeat', 'repeat-x', 'repeat-y', 'no-repeat']
\r
\r
@repeat_texts: () ->
\r
['repeat', 'repeat-x', 'repeat-y', 'no-repeat']
\r
\r
- panel: () ->
\r
- new Pettanr.Panel({id: @get('panel_id')})
\r
+ panel: (
options = {}
) ->
\r
+ new Pettanr.Panel({id: @get('panel_id')}
, options
)
\r
\r
picture: () ->
\r
new Pettanr.Picture({id: @get('picture_id')})
\r
\r
picture: () ->
\r
new Pettanr.Picture({id: @get('picture_id')})
\r
@@
-30,20
+30,22
@@
class Pettanr.GroundPicture extends Peta.Element
new Pettanr.Image.SymbolPicture({
\r
attr: {
\r
src: picture.r_url(),
\r
new Pettanr.Image.SymbolPicture({
\r
attr: {
\r
src: picture.r_url(),
\r
- alt: @
get
('caption')
\r
+ alt: @
escape
('caption')
\r
},
\r
picture: picture
\r
})
\r
\r
},
\r
picture: picture
\r
})
\r
\r
- symbol_option: (
cb
) ->
\r
+ symbol_option: () ->
\r
i = @picture()
\r
i = @picture()
\r
- _this = this
\r
- i.fetch({cache: true}).done ->
\r
- cb(_this.tmb_opt_img_tag(i))
\r
+ i.fetch({cache: true}).done =>
\r
+ @trigger('ready:symbol', i.tmb_opt_img_tag())
\r
\r
repeat_text: () ->
\r
Pettanr.GroundPicture.repeat_texts()[@get('repeat')]
\r
\r
\r
repeat_text: () ->
\r
Pettanr.GroundPicture.repeat_texts()[@get('repeat')]
\r
\r
+ element_face: () ->
\r
+ new Pettanr.Views.GroundPicture.ElementFace({element: this})
\r
+
\r
initialize: () ->
\r
if @id
\r
@url = @url + @id
\r
initialize: () ->
\r
if @id
\r
@url = @url + @id
\r