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:
[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
a861680
..
93a6a92
100644
(file)
--- a/
app/assets/javascripts/models/scroll_panel.js.coffee
+++ b/
app/assets/javascripts/models/scroll_panel.js.coffee
@@
-21,10
+21,10
@@
class Pettanr.ScrollPanel extends Peta.Leaf
Pettanr.Panel.licensed_pictures(panels)
\r
\r
scroll: () ->
\r
Pettanr.Panel.licensed_pictures(panels)
\r
\r
scroll: () ->
\r
- new Pettanr.
Scroll({id: @get('scroll_id')}
)
\r
+ new Pettanr.
Cache.Retriever(Pettanr.Scroll, @get('scroll_id')
)
\r
\r
panel: () ->
\r
\r
panel: () ->
\r
- new Pettanr.
Panel({id: @get('panel_id')}, {with_elements: true}
)
\r
+ new Pettanr.
Cache.Retriever(Pettanr.Panel, @get('panel_id')
)
\r
\r
has_panel: () ->
\r
if @get('panel_id')
\r
\r
has_panel: () ->
\r
if @get('panel_id')
\r
@@
-32,7
+32,8
@@
class Pettanr.ScrollPanel extends Peta.Leaf
else
\r
false
\r
\r
else
\r
false
\r
\r
- initialize: () ->
\r
+ initialize: (attr = {}, options = {}) ->
\r
+ super(attr, options)
\r
if @id
\r
@url = @url + @id
\r
\r
if @id
\r
@url = @url + @id
\r
\r