OSDN Git Service

conflict
authoryasushiito <yas@pen-chan.jp>
Thu, 1 Oct 2015 01:11:27 +0000 (10:11 +0900)
committeryasushiito <yas@pen-chan.jp>
Thu, 1 Oct 2015 01:11:27 +0000 (10:11 +0900)
1  2 
app/assets/javascripts/views/scrolls/play.js.coffee

@@@ -457,42 -483,41 +487,67 @@@ class Pettanr.Views.Scroll.PlayModule.B
      @pager = options.pager\r
      @items = @list.items()\r
    \r
-   render_empty: () ->\r
+   render: () ->\r
      this.$el.html('')\r
-     this.$el.append((new Tag.H2({content: I18n.t('scrolls.play.empty')})).render().el)\r
+     # paginate(@pager)\r
+     credits = new Pettanr.View.Credits(this, {icon: true})\r
+     @panels = new Pettanr.Views.Scroll.PlayModule.Panels({\r
+       parent: this,\r
+       binder: @binder,\r
+       items: @items,\r
+       credits: credits,\r
+     })\r
+     @listenTo(credits, 'click:credit:icon', @click_credit_icon)\r
+     @listenTo(@panels, 'click:insert', @click_insert)\r
+     @listenTo(@panels, 'click:move', @click_move)\r
+     @listenTo(@panels, 'dialog:close', @close_dialog)\r
+     this.$el.append(@panels.render().el)\r
+     @append_rb()\r
+     @appender = new Pettanr.Views.Scroll.PlayModule.Append({\r
+     })\r
+     @listenTo(@appender, 'click', @click_append)\r
+     this.$el.append(@appender.render().el)\r
+     if @is_appendable()\r
+       @appender.enable()\r
+     if @pager\r
+       @listenTo(@pager, 'page', @continue)\r
+       this.$el.append(@pager.render().el)\r
+     this.$el.append(credits.render().el)\r
+     @append_rb()\r
      this\r
    \r
-   render: () ->\r
-     if @items.length < 1\r
-       @render_empty()\r
+   is_appendable: () ->\r
+     return true if _.isEmpty(@items)\r
+     if @pager and @pager.hasNextPage()\r
+       false\r
      else\r
-       this\r
 +      this.$el.html('')\r
 +      # paginate(@pager)\r
 +      credits = new Pettanr.View.Credits(this, {icon: true})\r
 +      @panels = new Pettanr.Views.Scroll.PlayModule.Panels({\r
 +        parent: this,\r
 +        binder: @binder,\r
 +        items: @items,\r
 +        credits: credits,\r
 +      })\r
 +      @listenTo(credits, 'click:credit:icon', @click_credit_icon)\r
 +      @listenTo(@panels, 'http_get', @http_get)\r
 +      @listenTo(@panels, 'click:insert', @click_insert)\r
 +      @listenTo(@panels, 'click:move', @click_move)\r
 +      @listenTo(@panels, 'dialog:close', @close_dialog)\r
 +      @listenTo(@pager, 'page', @continue)\r
 +      this.$el.append(@panels.render().el)\r
 +      @append_rb()\r
 +      @appender = new Pettanr.Views.Scroll.PlayModule.Append({\r
 +      })\r
 +      @listenTo(@appender, 'click', @click_append)\r
 +      this.$el.append(@appender.render().el)\r
 +      if !@pager.hasNextPage()\r
 +        @appender.enable()\r
 +      this.$el.append(@pager.render().el)\r
 +      this.$el.append(credits.render().el)\r
 +      @append_rb()\r
+       true\r
    \r
    click_credit_icon: (item) ->\r
      @trigger('http_get', item.show_url())\r