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
/
scroll_panel.js.coffee
diff --git
a/app/assets/javascripts/models/scroll_panel.js.coffee
b/app/assets/javascripts/models/scroll_panel.js.coffee
index
d2ab014
..
a861680
100644
(file)
--- a/
app/assets/javascripts/models/scroll_panel.js.coffee
+++ b/
app/assets/javascripts/models/scroll_panel.js.coffee
@@
-14,11
+14,23
@@
class Pettanr.ScrollPanel extends Peta.Leaf
t: null
\r
}
\r
\r
t: null
\r
}
\r
\r
+ @licensed_pictures: (scroll_panels) ->
\r
+ panels = _.filter(scroll_panels, (sp) ->
\r
+ sp.has_panel()
\r
+ )
\r
+ Pettanr.Panel.licensed_pictures(panels)
\r
+
\r
scroll: () ->
\r
new Pettanr.Scroll({id: @get('scroll_id')})
\r
\r
panel: () ->
\r
scroll: () ->
\r
new Pettanr.Scroll({id: @get('scroll_id')})
\r
\r
panel: () ->
\r
- new Pettanr.Panel({id: @get('panel_id')})
\r
+ new Pettanr.Panel({id: @get('panel_id')}, {with_elements: true})
\r
+
\r
+ has_panel: () ->
\r
+ if @get('panel_id')
\r
+ true
\r
+ else
\r
+ false
\r
\r
initialize: () ->
\r
if @id
\r
\r
initialize: () ->
\r
if @id
\r