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
/
original_picture.js.coffee
diff --git
a/app/assets/javascripts/models/original_picture.js.coffee
b/app/assets/javascripts/models/original_picture.js.coffee
index
77015a3
..
06441e3
100644
(file)
--- a/
app/assets/javascripts/models/original_picture.js.coffee
+++ b/
app/assets/javascripts/models/original_picture.js.coffee
@@
-1,5
+1,4
@@
class Pettanr.OriginalPicture extends Peta.Content
\r
class Pettanr.OriginalPicture extends Peta.Content
\r
- url: '/original_pictures/'
\r
\r
@singular: () ->
\r
'OriginalPicture'
\r
\r
@singular: () ->
\r
'OriginalPicture'
\r
@@
-12,10
+11,7
@@
class Pettanr.OriginalPicture extends Peta.Content
artist_id: null
\r
}
\r
\r
artist_id: null
\r
}
\r
\r
- picture: () ->
\r
- new Pettanr.Picture({id: @get('picture_id')})
\r
-
\r
- is_visible: (operators) ->
\r
+ is_visible: (operators = Pettanr.cache.operators) ->
\r
@is_own(operators)
\r
\r
filename: () ->
\r
@is_own(operators)
\r
\r
filename: () ->
\r
@@
-27,31
+23,24
@@
class Pettanr.OriginalPicture extends Peta.Content
r_url: () ->
\r
'/original_pictures/' + @filename()
\r
\r
r_url: () ->
\r
'/original_pictures/' + @filename()
\r
\r
-
opt_img_tag
: () ->
\r
- {src: @r_url(), width: @get('width'), height: @get('height')}
\r
+
license_url
: () ->
\r
+ '/original_picture_license_groups/new/' + @get('id')
\r
\r
\r
- tmb_opt_img_tag: () ->
\r
- new Pettanr.Image.SymbolPicture({
\r
- attr: {
\r
- src: @r_url()
\r
- },
\r
- picture: this
\r
+ symbol_option: (context, options) ->
\r
+ @retrieve(this, {
\r
+ success: (symbol_item) =>
\r
+ options.success.call(context, symbol_item.symbol_file())
\r
})
\r
\r
})
\r
\r
- symbol_option: () ->
\r
- @fetch({cache: true}).done =>
\r
- @symbol_picture = @tmb_opt_img_tag()
\r
- @trigger('ready:symbol')
\r
-
\r
- filer_caption: () ->
\r
+ filer_caption: (context, options) ->
\r
history = @history()
\r
history.fetch({cache: true}).done =>
\r
history = @history()
\r
history.fetch({cache: true}).done =>
\r
-
@caption_text
= if _.isEmpty(history.models)
\r
+
caption
= if _.isEmpty(history.models)
\r
'unpublished'
\r
else
\r
head = _.first(history.models)
\r
Pettanr.to_s(head.get('revision'))
\r
'unpublished'
\r
else
\r
head = _.first(history.models)
\r
Pettanr.to_s(head.get('revision'))
\r
-
@trigger('ready:caption'
)
\r
+
options.success.call(context, caption
)
\r
\r
revision: () ->
\r
new Pettanr.OriginalPicture.Head({original_picture: this})
\r
\r
revision: () ->
\r
new Pettanr.OriginalPicture.Head({original_picture: this})
\r
@@
-84,20
+73,19
@@
class Pettanr.OriginalPicture extends Peta.Content
when @is_published()
\r
'published'
\r
\r
when @is_published()
\r
'published'
\r
\r
- initialize: () ->
\r
- if @id
\r
- @url = @url + @id
\r
+ initialize: (attr = {}, options = {}) ->
\r
+ super(attr, options)
\r
\r
class Pettanr.OriginalPicture.History extends Backbone.Collection
\r
\r
class Pettanr.OriginalPicture.History extends Backbone.Collection
\r
- url: '/original_pictures/'
\r
\r
initialize: (options) ->
\r
@original_picture = options.original_picture
\r
@model = Pettanr.Picture
\r
\r
initialize: (options) ->
\r
@original_picture = options.original_picture
\r
@model = Pettanr.Picture
\r
- @url = @
url + @original_picture.get('id'
) + '/history'
\r
+ @url = @
original_picture.default_url(
) + '/history'
\r
\r
\r
-class Pettanr.OriginalPicture.Head extends
Backbone
.View
\r
+class Pettanr.OriginalPicture.Head extends
Pettanr
.View
\r
tagName: 'span'
\r
tagName: 'span'
\r
+
\r
initialize: (options) ->
\r
@original_picture = options.original_picture
\r
@pictures = new Pettanr.OriginalPicture.History({id: @original_picture.get('id')})
\r
initialize: (options) ->
\r
@original_picture = options.original_picture
\r
@pictures = new Pettanr.OriginalPicture.History({id: @original_picture.get('id')})
\r