From c2b954f7004cb2bf4a8ea3b5fbc003f3306f45d8 Mon Sep 17 00:00:00 2001 From: yasushiito Date: Fri, 19 Jun 2015 18:28:40 +0900 Subject: [PATCH] fix:replace row break --- app/assets/javascripts/editor.js.coffee | 13 +++++---- app/assets/javascripts/editor/dialog.js.coffee | 2 +- .../javascripts/editor/panel_editor.js.coffee | 5 ++-- .../editor/panel_editor/dialog.js.coffee | 3 +-- .../editor/panel_editor/element/boards.js.coffee | 4 +-- .../panel_editor/element/new_board.js.coffee | 6 ++--- .../editor/panel_editor/scenario/element.js.coffee | 9 +++---- .../panel_editor/scenario/elements.js.coffee | 2 +- .../javascripts/editor/picture_publisher.js.coffee | 2 +- .../editor/picture_publisher/dialog.js.coffee | 3 +-- app/assets/javascripts/editor/player.js.coffee | 2 +- app/assets/javascripts/locmare/bucket.js.coffee | 2 +- app/assets/javascripts/locmare/filer.js.coffee | 2 +- .../javascripts/locmare/filer/body.js.coffee | 5 ++-- .../locmare/filer/body/file_body.js.coffee | 2 +- .../filer/body/file_body/file_item.js.coffee | 2 +- .../file_body/file_item/caption/base.js.coffee | 2 +- .../file_item/caption/default/face/base.js.coffee | 2 +- .../file_item/caption/default/link/base.js.coffee | 2 +- .../body/file_body/file_item/date/base.js.coffee | 2 +- .../body/file_body/file_item/edit/base.js.coffee | 2 +- .../body/file_body/file_item/icon/base.js.coffee | 2 +- .../file_body/file_item/summary/base.js.coffee | 2 +- .../body/file_body/file_item/symbol/base.js.coffee | 2 +- .../file_item/symbol/default/face/base.js.coffee | 2 +- .../file_item/symbol/default/link/base.js.coffee | 2 +- .../locmare/filer/body/file_header.js.coffee | 2 +- .../locmare/filer/body/file_header/base.js.coffee | 2 +- .../javascripts/locmare/filer/header.js.coffee | 2 +- app/assets/javascripts/locmare/form.js.coffee | 8 +++--- .../locmare/form/extend_field.js.coffee | 7 ++--- .../javascripts/locmare/form/field.js.coffee | 6 ++--- .../locmare/form/field/helper/base.js.coffee | 2 +- .../locmare/form/field/helper/color.js.coffee | 9 +++---- .../locmare/form/field/helper/size.js.coffee | 6 ++--- .../locmare/form/field/helper/tail_angle.js.coffee | 6 ++--- .../locmare/form/field/label/label.js.coffee | 2 +- .../locmare/form/field/tag/base.js.coffee | 2 +- .../locmare/list_group/lib/pager.js.coffee | 11 ++++---- .../locmare/list_group/lib/play_pager.js.coffee | 3 +-- app/assets/javascripts/locmare/profiler.js.coffee | 2 +- .../locmare/profiler/association.js.coffee | 2 +- .../profiler/association/belongs_to.js.coffee | 2 +- .../profiler/association/has_many.js.coffee | 2 +- .../locmare/profiler/association/has_one.js.coffee | 2 +- .../javascripts/locmare/profiler/column.js.coffee | 2 +- .../locmare/profiler/column/base.js.coffee | 14 +++++----- .../profiler/column/extend/extend_column.js.coffee | 6 ++--- .../javascripts/locmare/profiler/header.js.coffee | 2 +- .../javascripts/models/original_picture.js.coffee | 2 +- app/assets/javascripts/pettanr/tg.js.coffee | 6 +++++ app/assets/javascripts/tags.js.coffee | 14 +++++----- app/assets/javascripts/view.js.coffee | 5 ++++ .../javascripts/views/artists/show.js.coffee | 6 ++--- .../javascripts/views/authors/show.js.coffee | 10 +++---- .../javascripts/views/balloons/element.js.coffee | 2 +- .../javascripts/views/balloons/show.js.coffee | 5 ++-- .../views/comic_stories/stories_count.js.coffee | 2 +- app/assets/javascripts/views/comics/play.js.coffee | 10 +++---- app/assets/javascripts/views/comics/show.js.coffee | 2 +- app/assets/javascripts/views/common.js.coffee | 12 ++++----- .../views/ground_colors/element.js.coffee | 2 +- .../views/ground_colors/element_face.js.coffee | 2 +- .../views/ground_colors/new_element.js.coffee | 2 +- .../javascripts/views/ground_colors/show.js.coffee | 5 ++-- .../views/ground_colors/symbol.js.coffee | 2 +- .../views/ground_pictures/element.js.coffee | 2 +- .../views/ground_pictures/element_face.js.coffee | 4 +-- .../views/ground_pictures/new_element.js.coffee | 2 +- .../views/ground_pictures/show.js.coffee | 5 ++-- app/assets/javascripts/views/history.js.coffee | 8 +++--- app/assets/javascripts/views/home/show.js.coffee | 2 +- app/assets/javascripts/views/layout.js.coffee | 5 ++-- .../javascripts/views/layouts/blog.js.coffee | 6 ++--- app/assets/javascripts/views/layouts/sns.js.coffee | 6 ++--- .../views/license_groups/show.js.coffee | 2 +- .../javascripts/views/licenses/show.js.coffee | 2 +- .../views/original_pictures/img.js.coffee | 2 +- .../views/original_pictures/publish.js.coffee | 2 +- .../views/original_pictures/show.js.coffee | 6 ++--- .../views/original_pictures/summary.js.coffee | 3 +-- .../views/panel_pictures/element.js.coffee | 4 +-- .../views/panel_pictures/element_face.js.coffee | 4 +-- .../views/panel_pictures/new_element.js.coffee | 2 +- .../views/panel_pictures/show.js.coffee | 5 ++-- app/assets/javascripts/views/panels/body.js.coffee | 4 +-- app/assets/javascripts/views/panels/show.js.coffee | 7 +++-- .../javascripts/views/pictures/credit.js.coffee | 5 ++-- .../views/pictures/credit_icon.js.coffee | 2 +- .../javascripts/views/pictures/history.js.coffee | 2 +- .../javascripts/views/pictures/show.js.coffee | 2 +- .../views/resource_picture_pictures/show.js.coffee | 2 +- .../views/resource_pictures/credit.js.coffee | 5 ++-- .../views/resource_pictures/credit_icon.js.coffee | 2 +- .../views/resource_pictures/form.js.coffee | 2 +- .../views/resource_pictures/img.js.coffee | 2 +- .../views/resource_pictures/show.js.coffee | 4 +-- .../views/scroll_panels/new_element.js.coffee | 2 +- .../javascripts/views/scrolls/play.js.coffee | 31 +++++++++------------- .../javascripts/views/scrolls/show.js.coffee | 2 +- app/assets/javascripts/views/sheets/play.js.coffee | 15 +++++------ app/assets/javascripts/views/sheets/show.js.coffee | 2 +- app/assets/javascripts/views/show.js.coffee | 10 +++---- .../views/speech_balloon_templates/show.js.coffee | 2 +- .../views/speech_balloons/element.js.coffee | 2 +- .../views/speech_balloons/element_face.js.coffee | 7 +++-- .../views/speech_balloons/new_element.js.coffee | 2 +- .../views/speech_balloons/show.js.coffee | 5 ++-- .../javascripts/views/speeches/element.js.coffee | 4 +-- .../javascripts/views/speeches/show.js.coffee | 5 ++-- .../javascripts/views/stories/play.js.coffee | 12 ++++----- .../javascripts/views/stories/show.js.coffee | 2 +- .../views/system_pictures/show.js.coffee | 2 +- app/assets/javascripts/views/top/demo.js.coffee | 2 +- .../javascripts/views/user_sessions/new.js.coffee | 2 +- .../javascripts/views/users/account.js.coffee | 4 +-- app/assets/javascripts/views/users/guest.js.coffee | 2 +- .../views/writing_formats/show.js.coffee | 2 +- app/assets/javascripts/yasapp.js | 6 +++-- 119 files changed, 246 insertions(+), 263 deletions(-) create mode 100644 app/assets/javascripts/pettanr/tg.js.coffee create mode 100644 app/assets/javascripts/view.js.coffee diff --git a/app/assets/javascripts/editor.js.coffee b/app/assets/javascripts/editor.js.coffee index 5ad022a7..da3b08f2 100644 --- a/app/assets/javascripts/editor.js.coffee +++ b/app/assets/javascripts/editor.js.coffee @@ -1,7 +1,7 @@ class Editor @Editor = Editor class Editor.EditorModule -class Editor.EditorModule.DockBase extends Backbone.View +class Editor.EditorModule.DockBase extends Pettanr.View initialize: (options) -> @parent = options.parent @@ -71,8 +71,7 @@ class Editor.EditorModule.DockModule.BoardBay extends Editor.EditorModule.DockMo render: () -> this.$el.html('') @el.className = @body.dom_class() - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this dom_labels_class: () -> @@ -107,7 +106,7 @@ class Editor.EditorModule.DockModule.Board extends Editor.EditorModule.DockModul header_class: () -> "" -class Editor.EditorModule.DockModule.Bucket extends Backbone.View +class Editor.EditorModule.DockModule.Bucket extends Pettanr.View initialize: (options) -> super(options) @@ -124,7 +123,7 @@ class Editor.EditorModule.DockModule.FormBucket extends Editor.EditorModule.Dock class Editor.EditorModule.DockModule.TabModule -class Editor.EditorModule.DockModule.TabModule.Label extends Backbone.View +class Editor.EditorModule.DockModule.TabModule.Label extends Pettanr.View initialize: (options) -> @parent = options.parent @@ -148,7 +147,7 @@ class Editor.EditorModule.DockModule.TabModule.Label extends Backbone.View body: () -> @parent.body -class Editor.EditorModule.DockModule.TabModule.Body extends Backbone.View +class Editor.EditorModule.DockModule.TabModule.Body extends Pettanr.View initialize: (options) -> @parent = options.parent @@ -278,7 +277,7 @@ class Editor.EditorModule.DockModule.TabModule.BoardBody extends Editor.EditorMo dom_class: () -> @board().dom_class() + '-body' -class Editor.EditorModule.DestroyButton extends Backbone.View +class Editor.EditorModule.DestroyButton extends Pettanr.View tagName: 'button' render: () -> diff --git a/app/assets/javascripts/editor/dialog.js.coffee b/app/assets/javascripts/editor/dialog.js.coffee index dde7f96d..7af816de 100644 --- a/app/assets/javascripts/editor/dialog.js.coffee +++ b/app/assets/javascripts/editor/dialog.js.coffee @@ -1,4 +1,4 @@ -class Editor.Dialog extends Backbone.View +class Editor.Dialog extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/editor/panel_editor.js.coffee b/app/assets/javascripts/editor/panel_editor.js.coffee index 32e61276..3b2c2aa2 100644 --- a/app/assets/javascripts/editor/panel_editor.js.coffee +++ b/app/assets/javascripts/editor/panel_editor.js.coffee @@ -1,4 +1,4 @@ -class Editor.PanelEditor extends Backbone.View +class Editor.PanelEditor extends Pettanr.View tagName: 'div' className: 'panel-editor' @@ -47,8 +47,7 @@ class Editor.PanelEditor extends Backbone.View this.$el.append(@body.render().el) this.$el.append(@dock.render().el) this.$el.append(@credits.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() @dock.init_tabs() @dock.$el.tabs() this diff --git a/app/assets/javascripts/editor/panel_editor/dialog.js.coffee b/app/assets/javascripts/editor/panel_editor/dialog.js.coffee index 9b430190..65ffd9bd 100644 --- a/app/assets/javascripts/editor/panel_editor/dialog.js.coffee +++ b/app/assets/javascripts/editor/panel_editor/dialog.js.coffee @@ -14,8 +14,7 @@ class Editor.PanelEditor.Dialog extends Editor.Dialog refresh: (view) -> this.$el.html('') this.$el.append(@history.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this.$el.append(view.el) getter_proxy: () -> diff --git a/app/assets/javascripts/editor/panel_editor/element/boards.js.coffee b/app/assets/javascripts/editor/panel_editor/element/boards.js.coffee index 0cf61011..6928a046 100644 --- a/app/assets/javascripts/editor/panel_editor/element/boards.js.coffee +++ b/app/assets/javascripts/editor/panel_editor/element/boards.js.coffee @@ -1,4 +1,4 @@ -class Editor.EditorModule.DockModule.ElementBay.Boards extends Backbone.View +class Editor.EditorModule.DockModule.ElementBay.Boards extends Pettanr.View tagName: 'div' className: 'boards ui-tabs-vertical ui-helper-clearfix' @@ -25,7 +25,7 @@ class Editor.EditorModule.DockModule.ElementBay.Boards extends Backbone.View # data-z copy to model @trigger('sorted') -class Editor.EditorModule.DockModule.ElementBay.Labels extends Backbone.View +class Editor.EditorModule.DockModule.ElementBay.Labels extends Pettanr.View tagName: 'ul' initialize: (options) -> diff --git a/app/assets/javascripts/editor/panel_editor/element/new_board.js.coffee b/app/assets/javascripts/editor/panel_editor/element/new_board.js.coffee index 77ab615f..5adbb39f 100644 --- a/app/assets/javascripts/editor/panel_editor/element/new_board.js.coffee +++ b/app/assets/javascripts/editor/panel_editor/element/new_board.js.coffee @@ -62,7 +62,7 @@ class Editor.EditorModule.DockModule.TabModule.NewElementBoardBody extends Edito close_dialog: (dialog) -> @trigger('dialog:close', dialog) -class Editor.EditorModule.DockModule.NewElementLaunchers extends Backbone.View +class Editor.EditorModule.DockModule.NewElementLaunchers extends Pettanr.View tagName: 'div' className: 'new-element-buttons' @@ -94,7 +94,7 @@ class Editor.EditorModule.DockModule.NewElementLaunchers extends Backbone.View dock: () -> @parent.dock() -class Editor.EditorModule.DockModule.NewElementLauncher extends Backbone.View +class Editor.EditorModule.DockModule.NewElementLauncher extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -164,7 +164,7 @@ class Editor.EditorModule.DockModule.NewElementLauncher extends Backbone.View dock: () -> @parent.dock() -class Editor.EditorModule.DockModule.NewElementLauncherHeader extends Backbone.View +class Editor.EditorModule.DockModule.NewElementLauncherHeader extends Pettanr.View tagName: 'h3' initialize: (options) -> diff --git a/app/assets/javascripts/editor/panel_editor/scenario/element.js.coffee b/app/assets/javascripts/editor/panel_editor/scenario/element.js.coffee index 48b66a71..75925c0b 100644 --- a/app/assets/javascripts/editor/panel_editor/scenario/element.js.coffee +++ b/app/assets/javascripts/editor/panel_editor/scenario/element.js.coffee @@ -1,4 +1,4 @@ -class Editor.EditorModule.DockModule.ScenarioBay.Element extends Backbone.View +class Editor.EditorModule.DockModule.ScenarioBay.Element extends Pettanr.View tagName: 'li' className: 't-label' @@ -18,8 +18,7 @@ class Editor.EditorModule.DockModule.ScenarioBay.Element extends Backbone.View }) this.$el.append(@label.render().$el) this.$el.append(@body.render().$el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this refresh: () -> @@ -31,7 +30,7 @@ class Editor.EditorModule.DockModule.ScenarioBay.Element extends Backbone.View dom_id: () -> super() + '-' + @element.get('id') # use tab index -class Editor.EditorModule.DockModule.ScenarioBay.ElementLabel extends Backbone.View +class Editor.EditorModule.DockModule.ScenarioBay.ElementLabel extends Pettanr.View className: 'scenario-label' initialize: (options) -> @@ -59,7 +58,7 @@ class Editor.EditorModule.DockModule.ScenarioBay.ElementLabel extends Backbone.V dock: () -> @bay().dock() -class Editor.EditorModule.DockModule.ScenarioBay.ElementBody extends Backbone.View +class Editor.EditorModule.DockModule.ScenarioBay.ElementBody extends Pettanr.View initialize: (options) -> super(options) diff --git a/app/assets/javascripts/editor/panel_editor/scenario/elements.js.coffee b/app/assets/javascripts/editor/panel_editor/scenario/elements.js.coffee index 0a2bf5b9..c0ee1436 100644 --- a/app/assets/javascripts/editor/panel_editor/scenario/elements.js.coffee +++ b/app/assets/javascripts/editor/panel_editor/scenario/elements.js.coffee @@ -1,4 +1,4 @@ -class Editor.EditorModule.DockModule.ScenarioBay.Elements extends Backbone.View +class Editor.EditorModule.DockModule.ScenarioBay.Elements extends Pettanr.View tagName: 'ul' className: 'scenarios_elements' diff --git a/app/assets/javascripts/editor/picture_publisher.js.coffee b/app/assets/javascripts/editor/picture_publisher.js.coffee index 105dfa39..a01fed6d 100644 --- a/app/assets/javascripts/editor/picture_publisher.js.coffee +++ b/app/assets/javascripts/editor/picture_publisher.js.coffee @@ -1 +1 @@ -class Editor.PicturePublisher extends Backbone.View +class Editor.PicturePublisher extends Pettanr.View diff --git a/app/assets/javascripts/editor/picture_publisher/dialog.js.coffee b/app/assets/javascripts/editor/picture_publisher/dialog.js.coffee index c3f63dc2..593321ad 100644 --- a/app/assets/javascripts/editor/picture_publisher/dialog.js.coffee +++ b/app/assets/javascripts/editor/picture_publisher/dialog.js.coffee @@ -29,8 +29,7 @@ class Editor.PicturePublisher.Dialog extends Editor.Dialog next: (opl) -> @title({controller: 'original_picture_licenses', action: 'new'}) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() @form = Locmare.Form.factory({ form_name: opl.item_name(), use_name: 'default', diff --git a/app/assets/javascripts/editor/player.js.coffee b/app/assets/javascripts/editor/player.js.coffee index 0325ffb0..75d5c557 100644 --- a/app/assets/javascripts/editor/player.js.coffee +++ b/app/assets/javascripts/editor/player.js.coffee @@ -1 +1 @@ -class Editor.Player extends Backbone.View +class Editor.Player extends Pettanr.View diff --git a/app/assets/javascripts/locmare/bucket.js.coffee b/app/assets/javascripts/locmare/bucket.js.coffee index 0c4b3e93..caeae727 100644 --- a/app/assets/javascripts/locmare/bucket.js.coffee +++ b/app/assets/javascripts/locmare/bucket.js.coffee @@ -1,4 +1,4 @@ -class Locmare.Bucket extends Backbone.View +class Locmare.Bucket extends Pettanr.View tagName: 'form' @factory: (bucket_or_form_name, use_name, item, submit) -> diff --git a/app/assets/javascripts/locmare/filer.js.coffee b/app/assets/javascripts/locmare/filer.js.coffee index 16c7b834..0fd0c0d7 100644 --- a/app/assets/javascripts/locmare/filer.js.coffee +++ b/app/assets/javascripts/locmare/filer.js.coffee @@ -1,4 +1,4 @@ -class Locmare.Filer extends Backbone.View +class Locmare.Filer extends Pettanr.View tagName: 'div' className: 'filer' diff --git a/app/assets/javascripts/locmare/filer/body.js.coffee b/app/assets/javascripts/locmare/filer/body.js.coffee index 5aab71b8..18faa76d 100644 --- a/app/assets/javascripts/locmare/filer/body.js.coffee +++ b/app/assets/javascripts/locmare/filer/body.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.Body extends Backbone.View +class Locmare.FilerModule.Body extends Pettanr.View tagName: 'ul' className: 'filer-body' @@ -15,8 +15,7 @@ class Locmare.FilerModule.Body extends Backbone.View render: () -> this.$el.append(@file_header.render().el) this.$el.append(@file_body.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this manifest: () -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body.js.coffee index 223b4938..c370d9d4 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBody extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBody extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee index b735994d..fd73c7f1 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBodyModule.FileItem extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBodyModule.FileItem extends Pettanr.View tagName: 'li' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/base.js.coffee index b8deb9a1..d1f52c6d 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.Base extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.Base extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/base.js.coffee index 2f825e0f..1da63a43 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.DefaultModule.FaceModule.BaseFace extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.DefaultModule.FaceModule.BaseFace extends Pettanr.View initialize: (options) -> @default_caption = options.default_caption diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/base.js.coffee index ac08b102..57580801 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.DefaultModule.LinkModule.BaseLink extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.DefaultModule.LinkModule.BaseLink extends Pettanr.View tagName: 'a' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/date/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/date/base.js.coffee index 17a65d82..223066d8 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/date/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/date/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.DateItemColumnModule.Base extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.DateItemColumnModule.Base extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/base.js.coffee index 671600cd..66d10b2a 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.EditItemColumnModule.Base extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.EditItemColumnModule.Base extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/base.js.coffee index 70ea7cfa..e9b567b6 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.IconItemColumnModule.Base extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.IconItemColumnModule.Base extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/summary/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/summary/base.js.coffee index d2fa6fb7..03079e95 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/summary/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/summary/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SummaryItemColumnModule.Base extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SummaryItemColumnModule.Base extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/base.js.coffee index 1db3f8ee..db6b365b 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.Base extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.Base extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/base.js.coffee index 7361a7dc..e0b44bd4 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.DefaultModule.FaceModule.BaseFace extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.DefaultModule.FaceModule.BaseFace extends Pettanr.View initialize: (options) -> @default_symbol = options.default_symbol diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/base.js.coffee index 0d3f96d5..3d95ab02 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.DefaultModule.LinkModule.BaseLink extends Backbone.View +class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.DefaultModule.LinkModule.BaseLink extends Pettanr.View initialize: (options) -> @default_symbol = options.default_symbol diff --git a/app/assets/javascripts/locmare/filer/body/file_header.js.coffee b/app/assets/javascripts/locmare/filer/body/file_header.js.coffee index c9ab3bc8..f92ed264 100644 --- a/app/assets/javascripts/locmare/filer/body/file_header.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_header.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileHeader extends Backbone.View +class Locmare.FilerModule.BodyModule.FileHeader extends Pettanr.View tagName: 'li' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee index 9badf3d4..6384e9e2 100644 --- a/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.BodyModule.FileHeaderModule.Base extends Backbone.View +class Locmare.FilerModule.BodyModule.FileHeaderModule.Base extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/filer/header.js.coffee b/app/assets/javascripts/locmare/filer/header.js.coffee index 6b4fbec6..3176bd84 100644 --- a/app/assets/javascripts/locmare/filer/header.js.coffee +++ b/app/assets/javascripts/locmare/filer/header.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FilerModule.Header extends Backbone.View +class Locmare.FilerModule.Header extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/form.js.coffee b/app/assets/javascripts/locmare/form.js.coffee index 4e55865a..96307832 100644 --- a/app/assets/javascripts/locmare/form.js.coffee +++ b/app/assets/javascripts/locmare/form.js.coffee @@ -1,7 +1,7 @@ # form_name_with_sub_form # item: editing item # submit: string / 'submit' -class Locmare.FormBase extends Backbone.View +class Locmare.FormBase extends Pettanr.View tagName: 'form' initialize: (options) -> @@ -291,7 +291,7 @@ class Locmare.ExtendForm extends Locmare.FormBase true class Locmare.FormModule -class Locmare.FormModule.Fields extends Backbone.View +class Locmare.FormModule.Fields extends Pettanr.View tagName: 'div' className: 'fields' @@ -303,11 +303,11 @@ class Locmare.FormModule.Fields extends Backbone.View this.$el.html('') _.each @fields, (field) => this.$el.append(field.render().el) - this.$el.append(field.rb.render().el) if field.rb + this.$el.append(field.rb) if field.rb this class Locmare.FormModule.SubmitModule -class Locmare.FormModule.SubmitModule.Default extends Backbone.View +class Locmare.FormModule.SubmitModule.Default extends Pettanr.View tagName: 'div' className: 'actions' diff --git a/app/assets/javascripts/locmare/form/extend_field.js.coffee b/app/assets/javascripts/locmare/form/extend_field.js.coffee index 943bacba..5f9cb5a7 100644 --- a/app/assets/javascripts/locmare/form/extend_field.js.coffee +++ b/app/assets/javascripts/locmare/form/extend_field.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FormModule.ExtendField extends Backbone.View +class Locmare.FormModule.ExtendField extends Pettanr.View tagName: 'div' className: 'extend-field' @@ -62,10 +62,7 @@ class Locmare.FormModule.ExtendField extends Backbone.View row_break: () -> if @field_manifest.row_break - new Tag.Div({ - content: null, - class_name: 'row_break' - }) + Tg.rb({class_name: 'row_break'}) else null diff --git a/app/assets/javascripts/locmare/form/field.js.coffee b/app/assets/javascripts/locmare/form/field.js.coffee index 8b8a56ff..a0fd5133 100644 --- a/app/assets/javascripts/locmare/form/field.js.coffee +++ b/app/assets/javascripts/locmare/form/field.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FormModule.Field extends Backbone.View +class Locmare.FormModule.Field extends Pettanr.View tagName: 'div' className: 'field' @@ -62,12 +62,12 @@ class Locmare.FormModule.Field extends Backbone.View row_break: () -> if @field_manifest.row_break - new Tag.RowBreak() + Tg.rb() else null class Locmare.FormModule.FieldModule -class Locmare.FormModule.FieldModule.Helpers extends Backbone.View +class Locmare.FormModule.FieldModule.Helpers extends Pettanr.View tagName: 'span' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/form/field/helper/base.js.coffee b/app/assets/javascripts/locmare/form/field/helper/base.js.coffee index 95b0b34b..7ef04cd2 100644 --- a/app/assets/javascripts/locmare/form/field/helper/base.js.coffee +++ b/app/assets/javascripts/locmare/form/field/helper/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FormModule.FieldModule.HelperModule.Base extends Backbone.View +class Locmare.FormModule.FieldModule.HelperModule.Base extends Pettanr.View tagName: 'span' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/form/field/helper/color.js.coffee b/app/assets/javascripts/locmare/form/field/helper/color.js.coffee index 5d3794ce..042736c3 100644 --- a/app/assets/javascripts/locmare/form/field/helper/color.js.coffee +++ b/app/assets/javascripts/locmare/form/field/helper/color.js.coffee @@ -9,7 +9,6 @@ class Locmare.FormModule.FieldModule.HelperModule.Color extends Locmare.FormModu @picker = new Locmare.FormModule.FieldModule.HelperModule.ColorModule.Picker({field: @field, helper: this}) @swatch = new Locmare.FormModule.FieldModule.HelperModule.ColorModule.Swatch({field: @field, helper: this}) @status = new Locmare.FormModule.FieldModule.HelperModule.ColorModule.Status({field: @field, helper: this}) - @rb = new Tag.RowBreak() render: () -> @attr = { @@ -20,7 +19,7 @@ class Locmare.FormModule.FieldModule.HelperModule.Color extends Locmare.FormModu this.$el.append(@picker.render().el) this.$el.append(@swatch.render().el) this.$el.append(@status.render().el) - this.$el.append(@rb.render().el) + @rb() this refresh: () -> @@ -64,7 +63,7 @@ class Locmare.FormModule.FieldModule.HelperModule.ColorModule.Slider extends Tag volume: () -> (@field.value() >> @shift) & 0xFF -class Locmare.FormModule.FieldModule.HelperModule.ColorModule.Picker extends Backbone.View +class Locmare.FormModule.FieldModule.HelperModule.ColorModule.Picker extends Pettanr.View tagName: 'div' className: 'colorpickers' @@ -116,7 +115,7 @@ class Locmare.FormModule.FieldModule.HelperModule.ColorModule.Picker extends Bac refresh: () -> null -class Locmare.FormModule.FieldModule.HelperModule.ColorModule.Swatch extends Backbone.View +class Locmare.FormModule.FieldModule.HelperModule.ColorModule.Swatch extends Pettanr.View tagName: 'div' className: 'code_swatch' @@ -138,7 +137,7 @@ class Locmare.FormModule.FieldModule.HelperModule.ColorModule.Swatch extends Bac refresh: () -> this.$el.css('background-color', '#' + @helper.h()) -class Locmare.FormModule.FieldModule.HelperModule.ColorModule.Status extends Backbone.View +class Locmare.FormModule.FieldModule.HelperModule.ColorModule.Status extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/form/field/helper/size.js.coffee b/app/assets/javascripts/locmare/form/field/helper/size.js.coffee index 17ac84cd..1a1ea6f2 100644 --- a/app/assets/javascripts/locmare/form/field/helper/size.js.coffee +++ b/app/assets/javascripts/locmare/form/field/helper/size.js.coffee @@ -18,7 +18,7 @@ class Locmare.FormModule.FieldModule.HelperModule.Size extends Locmare.FormModul null class Locmare.FormModule.FieldModule.HelperModule.SizeModule -class Locmare.FormModule.FieldModule.HelperModule.SizeModule.Reverse extends Backbone.View +class Locmare.FormModule.FieldModule.HelperModule.SizeModule.Reverse extends Pettanr.View tagName: 'button' className: 'reverse' events: { @@ -37,7 +37,7 @@ class Locmare.FormModule.FieldModule.HelperModule.SizeModule.Reverse extends Bac @field.trigger('change') return false -class Locmare.FormModule.FieldModule.HelperModule.SizeModule.Double extends Backbone.View +class Locmare.FormModule.FieldModule.HelperModule.SizeModule.Double extends Pettanr.View tagName: 'button' className: 'double' events: { @@ -57,7 +57,7 @@ class Locmare.FormModule.FieldModule.HelperModule.SizeModule.Double extends Back @field.trigger('change') return false -class Locmare.FormModule.FieldModule.HelperModule.SizeModule.Half extends Backbone.View +class Locmare.FormModule.FieldModule.HelperModule.SizeModule.Half extends Pettanr.View tagName: 'button' className: 'half' events: { diff --git a/app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee b/app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee index 8dc5163a..f1b13dd7 100644 --- a/app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee +++ b/app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee @@ -46,7 +46,7 @@ class Locmare.FormModule.FieldModule.HelperModule.TailAngle extends Locmare.Form @set_r(0) class Locmare.FormModule.FieldModule.HelperModule.TailAngleModule -class Locmare.FormModule.FieldModule.HelperModule.TailAngleModule.Down extends Backbone.View +class Locmare.FormModule.FieldModule.HelperModule.TailAngleModule.Down extends Pettanr.View tagName: 'button' className: 'r-down' events: { @@ -65,7 +65,7 @@ class Locmare.FormModule.FieldModule.HelperModule.TailAngleModule.Down extends B @helper.trigger('down') false -class Locmare.FormModule.FieldModule.HelperModule.TailAngleModule.Up extends Backbone.View +class Locmare.FormModule.FieldModule.HelperModule.TailAngleModule.Up extends Pettanr.View tagName: 'button' className: 'r-up' events: { @@ -84,7 +84,7 @@ class Locmare.FormModule.FieldModule.HelperModule.TailAngleModule.Up extends Bac @helper.trigger('up') false -class Locmare.FormModule.FieldModule.HelperModule.TailAngleModule.Reset extends Backbone.View +class Locmare.FormModule.FieldModule.HelperModule.TailAngleModule.Reset extends Pettanr.View tagName: 'button' className: 'r-reset' events: { diff --git a/app/assets/javascripts/locmare/form/field/label/label.js.coffee b/app/assets/javascripts/locmare/form/field/label/label.js.coffee index e5d9a391..d482457b 100644 --- a/app/assets/javascripts/locmare/form/field/label/label.js.coffee +++ b/app/assets/javascripts/locmare/form/field/label/label.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FormModule.FieldModule.LabelModule.Base extends Backbone.View +class Locmare.FormModule.FieldModule.LabelModule.Base extends Pettanr.View tagName: 'label' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/form/field/tag/base.js.coffee b/app/assets/javascripts/locmare/form/field/tag/base.js.coffee index 2ff1c93d..48b09bfc 100644 --- a/app/assets/javascripts/locmare/form/field/tag/base.js.coffee +++ b/app/assets/javascripts/locmare/form/field/tag/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.FormModule.FieldModule.TagModule.Base extends Backbone.View +class Locmare.FormModule.FieldModule.TagModule.Base extends Pettanr.View tagName: 'input' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/list_group/lib/pager.js.coffee b/app/assets/javascripts/locmare/list_group/lib/pager.js.coffee index d5516342..2b706e44 100644 --- a/app/assets/javascripts/locmare/list_group/lib/pager.js.coffee +++ b/app/assets/javascripts/locmare/list_group/lib/pager.js.coffee @@ -14,7 +14,7 @@ class Locmare.ListGroupModule.LibModule.Pager } class Locmare.ListGroupModule.LibModule.PagerModule -class Locmare.ListGroupModule.LibModule.PagerModule.Default extends Backbone.View +class Locmare.ListGroupModule.LibModule.PagerModule.Default extends Pettanr.View tagName: 'ul' className: 'pagination' @@ -77,8 +77,7 @@ class Locmare.ListGroupModule.LibModule.PagerModule.Default extends Backbone.Vie @listenTo(view, 'navigate', @navigate) @listenTo(view, 'page', @click) this.$el.append(view.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this range: () -> @@ -118,7 +117,7 @@ class Locmare.ListGroupModule.LibModule.PagerModule.Default extends Backbone.Vie navigate: (url) -> @trigger('http_get', url) -class Locmare.ListGroupModule.LibModule.PagerModule.Part extends Backbone.View +class Locmare.ListGroupModule.LibModule.PagerModule.Part extends Pettanr.View tagName: 'li' initialize: (options) -> @@ -162,7 +161,7 @@ class Locmare.ListGroupModule.LibModule.PagerModule.PrevPage extends Locmare.Lis content: () -> '<' -class Locmare.ListGroupModule.LibModule.PagerModule.PageGap extends Backbone.View +class Locmare.ListGroupModule.LibModule.PagerModule.PageGap extends Pettanr.View tagName: 'li' className: 'page-gap' @@ -185,7 +184,7 @@ class Locmare.ListGroupModule.LibModule.PagerModule.LastPage extends Locmare.Lis content: () -> '>>' -class Locmare.ListGroupModule.LibModule.PagerModule.More extends Backbone.View +class Locmare.ListGroupModule.LibModule.PagerModule.More extends Pettanr.View tagName: 'div' className: 'pagination' diff --git a/app/assets/javascripts/locmare/list_group/lib/play_pager.js.coffee b/app/assets/javascripts/locmare/list_group/lib/play_pager.js.coffee index 46d44cc0..4709e11f 100644 --- a/app/assets/javascripts/locmare/list_group/lib/play_pager.js.coffee +++ b/app/assets/javascripts/locmare/list_group/lib/play_pager.js.coffee @@ -20,8 +20,7 @@ class Locmare.ListGroupModule.LibModule.PlayPagerModule.Default extends Locmare. @listenTo(view, 'navigate', @navigate) @listenTo(view, 'page', @click) this.$el.append(view.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this class Locmare.ListGroupModule.LibModule.PlayPagerModule.NextPage extends Locmare.ListGroupModule.LibModule.PagerModule.Part diff --git a/app/assets/javascripts/locmare/profiler.js.coffee b/app/assets/javascripts/locmare/profiler.js.coffee index 345b7f21..8d8cbdf1 100644 --- a/app/assets/javascripts/locmare/profiler.js.coffee +++ b/app/assets/javascripts/locmare/profiler.js.coffee @@ -1,4 +1,4 @@ -class Locmare.Profiler extends Backbone.View +class Locmare.Profiler extends Pettanr.View tagName: 'div' className: 'profiler' diff --git a/app/assets/javascripts/locmare/profiler/association.js.coffee b/app/assets/javascripts/locmare/profiler/association.js.coffee index f1cb1e9c..5f22e43a 100644 --- a/app/assets/javascripts/locmare/profiler/association.js.coffee +++ b/app/assets/javascripts/locmare/profiler/association.js.coffee @@ -1,4 +1,4 @@ -class Locmare.ProfilerModule.Association extends Backbone.View +class Locmare.ProfilerModule.Association extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee b/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee index b428f05f..7f99c67a 100644 --- a/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee +++ b/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee @@ -1,4 +1,4 @@ -class Locmare.ProfilerModule.AssociationModule.BelongsTo extends Backbone.View +class Locmare.ProfilerModule.AssociationModule.BelongsTo extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee b/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee index 64c4f36f..d8c6a895 100644 --- a/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee +++ b/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee @@ -1,4 +1,4 @@ -class Locmare.ProfilerModule.AssociationModule.HasMany extends Backbone.View +class Locmare.ProfilerModule.AssociationModule.HasMany extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee b/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee index 5ffe58f6..07eadee3 100644 --- a/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee +++ b/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee @@ -1,4 +1,4 @@ -class Locmare.ProfilerModule.AssociationModule.HasOne extends Backbone.View +class Locmare.ProfilerModule.AssociationModule.HasOne extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/profiler/column.js.coffee b/app/assets/javascripts/locmare/profiler/column.js.coffee index 663341b1..0b5fbb4d 100644 --- a/app/assets/javascripts/locmare/profiler/column.js.coffee +++ b/app/assets/javascripts/locmare/profiler/column.js.coffee @@ -1,4 +1,4 @@ -class Locmare.ProfilerModule.Column extends Backbone.View +class Locmare.ProfilerModule.Column extends Pettanr.View tagName: 'div' className: 'columns' diff --git a/app/assets/javascripts/locmare/profiler/column/base.js.coffee b/app/assets/javascripts/locmare/profiler/column/base.js.coffee index 2cc24521..0b8ff410 100644 --- a/app/assets/javascripts/locmare/profiler/column/base.js.coffee +++ b/app/assets/javascripts/locmare/profiler/column/base.js.coffee @@ -1,4 +1,4 @@ -class Locmare.ProfilerModule.ColumnModule.Base extends Backbone.View +class Locmare.ProfilerModule.ColumnModule.Base extends Pettanr.View tagName: 'div' className: 'column' @@ -32,7 +32,7 @@ class Locmare.ProfilerModule.ColumnModule.Base extends Backbone.View note_class: () -> Locmare.ProfilerModule.ColumnModule.NoteNone -class Locmare.ProfilerModule.ColumnModule.Label extends Backbone.View +class Locmare.ProfilerModule.ColumnModule.Label extends Pettanr.View tagName: 'span' initialize: (options) -> @@ -45,7 +45,7 @@ class Locmare.ProfilerModule.ColumnModule.Label extends Backbone.View label: () -> Pettanr.AppHelper.t_a(@column.item().item_name(), @column.column_name) -class Locmare.ProfilerModule.ColumnModule.Value extends Backbone.View +class Locmare.ProfilerModule.ColumnModule.Value extends Pettanr.View tagName: 'span' initialize: (options) -> @@ -58,7 +58,7 @@ class Locmare.ProfilerModule.ColumnModule.Value extends Backbone.View value: () -> @column.item().escape(@column.column_name) -class Locmare.ProfilerModule.ColumnModule.DateValue extends Backbone.View +class Locmare.ProfilerModule.ColumnModule.DateValue extends Pettanr.View tagName: 'span' initialize: (options) -> @@ -72,7 +72,7 @@ class Locmare.ProfilerModule.ColumnModule.DateValue extends Backbone.View @column.item().get(@column.column_name) #Pettanr.format_date(@column.item().get(@column.column_name)) -class Locmare.ProfilerModule.ColumnModule.JsonValue extends Backbone.View +class Locmare.ProfilerModule.ColumnModule.JsonValue extends Pettanr.View tagName: 'pre' initialize: (options) -> @@ -86,7 +86,7 @@ class Locmare.ProfilerModule.ColumnModule.JsonValue extends Backbone.View # pre tag no need escapeHTML JSON.stringify(JSON.parse(@column.item().get(@column.column_name)), null, 2) -class Locmare.ProfilerModule.ColumnModule.ExtendValue extends Backbone.View +class Locmare.ProfilerModule.ColumnModule.ExtendValue extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -130,7 +130,7 @@ class Locmare.ProfilerModule.ColumnModule.NoteNone is_visible:() -> false -class Locmare.ProfilerModule.ColumnModule.Note extends Backbone.View +class Locmare.ProfilerModule.ColumnModule.Note extends Pettanr.View tagName: 'span' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/profiler/column/extend/extend_column.js.coffee b/app/assets/javascripts/locmare/profiler/column/extend/extend_column.js.coffee index 1ee15917..1c6a4553 100644 --- a/app/assets/javascripts/locmare/profiler/column/extend/extend_column.js.coffee +++ b/app/assets/javascripts/locmare/profiler/column/extend/extend_column.js.coffee @@ -1,4 +1,4 @@ -class Locmare.ProfilerModule.ColumnModule.ExtendModule.ExtendColumn extends Backbone.View +class Locmare.ProfilerModule.ColumnModule.ExtendModule.ExtendColumn extends Pettanr.View tagName: 'div' className: 'extend_column' @@ -23,7 +23,7 @@ class Locmare.ProfilerModule.ColumnModule.ExtendModule.ExtendColumn extends Back value_class: () -> Locmare.ProfilerModule.ColumnModule.ExtendModule.Value -class Locmare.ProfilerModule.ColumnModule.ExtendModule.Label extends Backbone.View +class Locmare.ProfilerModule.ColumnModule.ExtendModule.Label extends Pettanr.View tagName: 'span' initialize: (options) -> @@ -37,7 +37,7 @@ class Locmare.ProfilerModule.ColumnModule.ExtendModule.Label extends Backbone.Vi label: () -> Pettanr.AppHelper.t_a(@column.extend_item().item_name(), @extend_column.extend_column_name) -class Locmare.ProfilerModule.ColumnModule.ExtendModule.Value extends Backbone.View +class Locmare.ProfilerModule.ColumnModule.ExtendModule.Value extends Pettanr.View tagName: 'span' initialize: (options) -> diff --git a/app/assets/javascripts/locmare/profiler/header.js.coffee b/app/assets/javascripts/locmare/profiler/header.js.coffee index 4e4d4f4c..72a8e363 100644 --- a/app/assets/javascripts/locmare/profiler/header.js.coffee +++ b/app/assets/javascripts/locmare/profiler/header.js.coffee @@ -1,4 +1,4 @@ -class Locmare.ProfilerModule.Header extends Backbone.View +class Locmare.ProfilerModule.Header extends Pettanr.View tagName: 'div' className: 'header' diff --git a/app/assets/javascripts/models/original_picture.js.coffee b/app/assets/javascripts/models/original_picture.js.coffee index e6e457a0..f3deddc4 100644 --- a/app/assets/javascripts/models/original_picture.js.coffee +++ b/app/assets/javascripts/models/original_picture.js.coffee @@ -102,7 +102,7 @@ class Pettanr.OriginalPicture.History extends Backbone.Collection @model = Pettanr.Picture @url = @original_picture.default_url() + '/history' -class Pettanr.OriginalPicture.Head extends Backbone.View +class Pettanr.OriginalPicture.Head extends Pettanr.View tagName: 'span' initialize: (options) -> diff --git a/app/assets/javascripts/pettanr/tg.js.coffee b/app/assets/javascripts/pettanr/tg.js.coffee new file mode 100644 index 00000000..61e27b9b --- /dev/null +++ b/app/assets/javascripts/pettanr/tg.js.coffee @@ -0,0 +1,6 @@ +class Tg extends Tag + + @rb: (options = null) -> + rb = new Tag.RowBreak(options).render().el + +@Tg = Tg diff --git a/app/assets/javascripts/tags.js.coffee b/app/assets/javascripts/tags.js.coffee index 2f88422e..a50bcd47 100644 --- a/app/assets/javascripts/tags.js.coffee +++ b/app/assets/javascripts/tags.js.coffee @@ -1,6 +1,6 @@ class Tag -class Tag.Img extends Backbone.View +class Tag.Img extends Pettanr.View tagName: 'img' # attr: {src: '/hoge', width: 80, ...} @@ -14,7 +14,7 @@ class Tag.Img extends Backbone.View this.$el.addClass(@class_name) if @class_name this -class Tag.A_ extends Backbone.View +class Tag.A_ extends Pettanr.View tagName: 'a' initialize: (options) -> @@ -43,7 +43,7 @@ class Tag.A extends Tag.A_ @trigger('click') return false -class Tag.Div extends Backbone.View +class Tag.Div extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -60,7 +60,7 @@ class Tag.Div extends Backbone.View class Tag.Span extends Tag.Div tagName: 'span' -class Tag.Ul extends Backbone.View +class Tag.Ul extends Pettanr.View tagName: 'ul' initialize: (options) -> @@ -82,7 +82,7 @@ class Tag.RowBreak extends Tag.Div @content = null @class_name = 'row_break' -class Tag.H3 extends Backbone.View +class Tag.H3 extends Pettanr.View tagName: 'h3' initialize: (options) -> @@ -99,7 +99,7 @@ class Tag.H3 extends Backbone.View class Tag.H2 extends Tag.H3 tagName: 'h2' -class Tag.Input extends Backbone.View +class Tag.Input extends Pettanr.View tagName: 'input' initialize: (options) -> @@ -157,7 +157,7 @@ class Tag.Submit extends Tag.Input @trigger('click') return false -class Tag.Option extends Backbone.View +class Tag.Option extends Pettanr.View tagName: 'option' initialize: (options) -> diff --git a/app/assets/javascripts/view.js.coffee b/app/assets/javascripts/view.js.coffee new file mode 100644 index 00000000..e384dd77 --- /dev/null +++ b/app/assets/javascripts/view.js.coffee @@ -0,0 +1,5 @@ +class Pettanr.View extends Backbone.View + + rb: () -> + this.$el.append(Tg.rb) + diff --git a/app/assets/javascripts/views/artists/show.js.coffee b/app/assets/javascripts/views/artists/show.js.coffee index cb75eb16..3662a813 100644 --- a/app/assets/javascripts/views/artists/show.js.coffee +++ b/app/assets/javascripts/views/artists/show.js.coffee @@ -4,7 +4,7 @@ class Pettanr.Views.Artist.ShowModule.Header extends Pettanr.Views.Show.Header initialize: (options) -> super(options) -class Pettanr.Views.Artist.ShowModule.ResourcePictures extends Backbone.View +class Pettanr.Views.Artist.ShowModule.ResourcePictures extends Pettanr.View initialize: (options) -> super(options) @@ -33,7 +33,7 @@ class Pettanr.Views.Artist.ShowModule.ResourcePictures extends Backbone.View http_get: (url) -> @trigger('http_get', url) -class Pettanr.Views.Artist.ShowModule.Body extends Backbone.View +class Pettanr.Views.Artist.ShowModule.Body extends Pettanr.View initialize: (options) -> super(options) @@ -49,7 +49,7 @@ class Pettanr.Views.Artist.ShowModule.Body extends Backbone.View http_get: (url) -> @trigger('http_get', url) -class Pettanr.Views.Artist.Show extends Backbone.View +class Pettanr.Views.Artist.Show extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/authors/show.js.coffee b/app/assets/javascripts/views/authors/show.js.coffee index 1a6e9194..24881749 100644 --- a/app/assets/javascripts/views/authors/show.js.coffee +++ b/app/assets/javascripts/views/authors/show.js.coffee @@ -4,7 +4,7 @@ class Pettanr.Views.Author.ShowModule.Header extends Pettanr.Views.Show.Header initialize: (options) -> super(options) -class Pettanr.Views.Author.ShowModule.Scrolls extends Backbone.View +class Pettanr.Views.Author.ShowModule.Scrolls extends Pettanr.View initialize: (options) -> super(options) @@ -33,7 +33,7 @@ class Pettanr.Views.Author.ShowModule.Scrolls extends Backbone.View http_get: (url) -> @trigger('http_get', url) -class Pettanr.Views.Author.ShowModule.PanelsBody extends Backbone.View +class Pettanr.Views.Author.ShowModule.PanelsBody extends Pettanr.View initialize: (options) -> super(options) @@ -62,7 +62,7 @@ class Pettanr.Views.Author.ShowModule.PanelsBody extends Backbone.View ) this -class Pettanr.Views.Author.ShowModule.Panels extends Backbone.View +class Pettanr.Views.Author.ShowModule.Panels extends Pettanr.View initialize: (options) -> super(options) @@ -87,7 +87,7 @@ class Pettanr.Views.Author.ShowModule.Panels extends Backbone.View click_credit_icon: (item) -> @trigger('http_get', item.show_url()) -class Pettanr.Views.Author.ShowModule.Body extends Backbone.View +class Pettanr.Views.Author.ShowModule.Body extends Pettanr.View initialize: (options) -> super(options) @@ -106,7 +106,7 @@ class Pettanr.Views.Author.ShowModule.Body extends Backbone.View http_get: (url) -> @trigger('http_get', url) -class Pettanr.Views.Author.Show extends Backbone.View +class Pettanr.Views.Author.Show extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/balloons/element.js.coffee b/app/assets/javascripts/views/balloons/element.js.coffee index ce492b7b..f01d3d95 100644 --- a/app/assets/javascripts/views/balloons/element.js.coffee +++ b/app/assets/javascripts/views/balloons/element.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.Balloon.Element extends Backbone.View +class Pettanr.Views.Balloon.Element extends Pettanr.View tagName: 'img' className: 'pettanr-balloon' diff --git a/app/assets/javascripts/views/balloons/show.js.coffee b/app/assets/javascripts/views/balloons/show.js.coffee index 4ece36d7..a5783a0d 100644 --- a/app/assets/javascripts/views/balloons/show.js.coffee +++ b/app/assets/javascripts/views/balloons/show.js.coffee @@ -4,7 +4,7 @@ class Pettanr.Views.Balloon.ShowModule.Header extends Pettanr.Views.Show.Header initialize: (options) -> super(options) -class Pettanr.Views.Balloon.Show extends Backbone.View +class Pettanr.Views.Balloon.Show extends Pettanr.View tagName: 'div' className: 'show' @@ -60,8 +60,7 @@ class Pettanr.Views.Balloon.Show extends Backbone.View this.$el.append(@author.render().el) this.$el.append(@body.render().el) this.$el.append(@credits.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() click_show: () -> @trigger('http_get', @item.show_url()) diff --git a/app/assets/javascripts/views/comic_stories/stories_count.js.coffee b/app/assets/javascripts/views/comic_stories/stories_count.js.coffee index f5f4503c..ac2644a6 100644 --- a/app/assets/javascripts/views/comic_stories/stories_count.js.coffee +++ b/app/assets/javascripts/views/comic_stories/stories_count.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.ComicStory.StoryCount extends Backbone.View +class Pettanr.Views.ComicStory.StoryCount extends Pettanr.View initialize: (options) -> super(options) diff --git a/app/assets/javascripts/views/comics/play.js.coffee b/app/assets/javascripts/views/comics/play.js.coffee index c4d76812..963465b7 100644 --- a/app/assets/javascripts/views/comics/play.js.coffee +++ b/app/assets/javascripts/views/comics/play.js.coffee @@ -9,7 +9,7 @@ class Pettanr.Views.Comic.PlayModule.Owner extends Pettanr.Views.Show.Owner initialize: (options) -> super(options) -class Pettanr.Views.Comic.PlayModule.Footer extends Backbone.View +class Pettanr.Views.Comic.PlayModule.Footer extends Pettanr.View tagName: 'table' className: 'no-border' @@ -39,7 +39,7 @@ class Pettanr.Views.Comic.PlayModule.Footer extends Backbone.View this.$el.append('') this -class Pettanr.Views.Comic.PlayModule.Story extends Backbone.View +class Pettanr.Views.Comic.PlayModule.Story extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -57,7 +57,7 @@ class Pettanr.Views.Comic.PlayModule.Story extends Backbone.View this.$el.append('order') this -class Pettanr.Views.Comic.PlayModule.Stories extends Backbone.View +class Pettanr.Views.Comic.PlayModule.Stories extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -74,7 +74,7 @@ class Pettanr.Views.Comic.PlayModule.Stories extends Backbone.View this.$el.append(story_view.render().el) this -class Pettanr.Views.Comic.PlayModule.Body extends Backbone.View +class Pettanr.Views.Comic.PlayModule.Body extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -100,7 +100,7 @@ class Pettanr.Views.Comic.PlayModule.Body extends Backbone.View this.$el.append(panels.render().el) this -class Pettanr.Views.Comic.Play extends Backbone.View +class Pettanr.Views.Comic.Play extends Pettanr.View tagName: 'div' className: 'show' diff --git a/app/assets/javascripts/views/comics/show.js.coffee b/app/assets/javascripts/views/comics/show.js.coffee index 00291758..701a0458 100644 --- a/app/assets/javascripts/views/comics/show.js.coffee +++ b/app/assets/javascripts/views/comics/show.js.coffee @@ -9,7 +9,7 @@ class Pettanr.Views.Comic.ShowModule.Owner extends Pettanr.Views.Show.Owner initialize: (options) -> super(options) -class Pettanr.Views.Comic.Show extends Backbone.View +class Pettanr.Views.Comic.Show extends Pettanr.View tagName: 'div' className: 'show' diff --git a/app/assets/javascripts/views/common.js.coffee b/app/assets/javascripts/views/common.js.coffee index acc43bb3..6280e565 100644 --- a/app/assets/javascripts/views/common.js.coffee +++ b/app/assets/javascripts/views/common.js.coffee @@ -57,7 +57,7 @@ class Pettanr.Views.Common.RootIcon extends Pettanr.Views.Common.EmptyIcon file_name: () -> '/images/root.png' -class Pettanr.Views.Common.PickIcon extends Backbone.View +class Pettanr.Views.Common.PickIcon extends Pettanr.View initialize: (options) -> @class_name = options.class_name @@ -91,7 +91,7 @@ class Pettanr.Views.Common.PickIcon extends Backbone.View click: () -> @trigger('click', this) -class Pettanr.Views.Common.EmptyCaption extends Backbone.View +class Pettanr.Views.Common.EmptyCaption extends Pettanr.View tagName: 'div' className: 'empty' @@ -99,7 +99,7 @@ class Pettanr.Views.Common.EmptyCaption extends Backbone.View this.$el.html('empty') this -class Pettanr.Views.Common.Icon extends Backbone.View +class Pettanr.Views.Common.Icon extends Pettanr.View tagName: 'span' initialize: (options) -> @@ -124,7 +124,7 @@ class Pettanr.Views.Common.Icon extends Backbone.View url: () -> @icon_url -class Pettanr.Views.Common.Caption extends Backbone.View +class Pettanr.Views.Common.Caption extends Pettanr.View tagName: 'span' initialize: (options) -> @@ -149,7 +149,7 @@ class Pettanr.Views.Common.Caption extends Backbone.View url: () -> @url -class Pettanr.Views.Common.IconWithCaption extends Backbone.View +class Pettanr.Views.Common.IconWithCaption extends Pettanr.View tagName: 'span' initialize: (options) -> @@ -174,7 +174,7 @@ class Pettanr.Views.Common.IconWithCaption extends Backbone.View url: () -> @icon.url() -class Pettanr.Views.Common.Summary extends Backbone.View +class Pettanr.Views.Common.Summary extends Pettanr.View initialize: (options) -> @clear() diff --git a/app/assets/javascripts/views/ground_colors/element.js.coffee b/app/assets/javascripts/views/ground_colors/element.js.coffee index 05b02be6..ec234a2c 100644 --- a/app/assets/javascripts/views/ground_colors/element.js.coffee +++ b/app/assets/javascripts/views/ground_colors/element.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.GroundColor.Element extends Backbone.View +class Pettanr.Views.GroundColor.Element extends Pettanr.View tagName: 'div' className: 'pettanr-comic-ground-color' diff --git a/app/assets/javascripts/views/ground_colors/element_face.js.coffee b/app/assets/javascripts/views/ground_colors/element_face.js.coffee index cfe88645..aed9bb55 100644 --- a/app/assets/javascripts/views/ground_colors/element_face.js.coffee +++ b/app/assets/javascripts/views/ground_colors/element_face.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.GroundColor.ElementFace extends Backbone.View +class Pettanr.Views.GroundColor.ElementFace extends Pettanr.View tagName: 'div' className: 'elements-tab' diff --git a/app/assets/javascripts/views/ground_colors/new_element.js.coffee b/app/assets/javascripts/views/ground_colors/new_element.js.coffee index cea342ef..ca3f49e4 100644 --- a/app/assets/javascripts/views/ground_colors/new_element.js.coffee +++ b/app/assets/javascripts/views/ground_colors/new_element.js.coffee @@ -32,7 +32,7 @@ class Pettanr.Views.GroundColor.NewElementLauncher extends Editor.EditorModule.D click_inspire: () -> @click_default(@links_conf.inspire.params) -class Pettanr.Views.GroundColor.NewElement extends Backbone.View +class Pettanr.Views.GroundColor.NewElement extends Pettanr.View initialize: (options) -> @parent = options.parent diff --git a/app/assets/javascripts/views/ground_colors/show.js.coffee b/app/assets/javascripts/views/ground_colors/show.js.coffee index 622a836a..4a33e097 100644 --- a/app/assets/javascripts/views/ground_colors/show.js.coffee +++ b/app/assets/javascripts/views/ground_colors/show.js.coffee @@ -4,7 +4,7 @@ class Pettanr.Views.GroundColor.ShowModule.Header extends Pettanr.Views.Show.Hea initialize: (options) -> super(options) -class Pettanr.Views.GroundColor.Show extends Backbone.View +class Pettanr.Views.GroundColor.Show extends Pettanr.View tagName: 'div' className: 'show' @@ -55,8 +55,7 @@ class Pettanr.Views.GroundColor.Show extends Backbone.View this.$el.append(@author.render().el) this.$el.append(@body.render().el) this.$el.append(@credits.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() click_show: () -> @trigger('http_get', @item.show_url()) diff --git a/app/assets/javascripts/views/ground_colors/symbol.js.coffee b/app/assets/javascripts/views/ground_colors/symbol.js.coffee index 42ccff48..ba981fdc 100644 --- a/app/assets/javascripts/views/ground_colors/symbol.js.coffee +++ b/app/assets/javascripts/views/ground_colors/symbol.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.GroundColor.Symbol extends Backbone.View +class Pettanr.Views.GroundColor.Symbol extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/ground_pictures/element.js.coffee b/app/assets/javascripts/views/ground_pictures/element.js.coffee index 70061aa2..b635ae55 100644 --- a/app/assets/javascripts/views/ground_pictures/element.js.coffee +++ b/app/assets/javascripts/views/ground_pictures/element.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.GroundPicture.Element extends Backbone.View +class Pettanr.Views.GroundPicture.Element extends Pettanr.View tagName: 'div' className: 'pettanr-comic-ground-picture' diff --git a/app/assets/javascripts/views/ground_pictures/element_face.js.coffee b/app/assets/javascripts/views/ground_pictures/element_face.js.coffee index 9e7d89f8..6c54eaeb 100644 --- a/app/assets/javascripts/views/ground_pictures/element_face.js.coffee +++ b/app/assets/javascripts/views/ground_pictures/element_face.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.GroundPicture.ElementSymbol extends Backbone.View +class Pettanr.Views.GroundPicture.ElementSymbol extends Pettanr.View tagName: 'div' className: 'elements-tab-face-icon' @@ -16,7 +16,7 @@ class Pettanr.Views.GroundPicture.ElementSymbol extends Backbone.View img = @element.tmb_opt_img_tag(@picture) this.$el.html(img.render().el) -class Pettanr.Views.GroundPicture.ElementFace extends Backbone.View +class Pettanr.Views.GroundPicture.ElementFace extends Pettanr.View tagName: 'div' className: 'elements-tab' diff --git a/app/assets/javascripts/views/ground_pictures/new_element.js.coffee b/app/assets/javascripts/views/ground_pictures/new_element.js.coffee index 2b6f2c07..39a9e5c9 100644 --- a/app/assets/javascripts/views/ground_pictures/new_element.js.coffee +++ b/app/assets/javascripts/views/ground_pictures/new_element.js.coffee @@ -59,7 +59,7 @@ class Pettanr.Views.GroundPicture.NewElementLauncher extends Editor.EditorModule click_inspire_my_recent: () -> @click_default(@links_conf.inspire_my_recent.params) -class Pettanr.Views.GroundPicture.NewElement extends Backbone.View +class Pettanr.Views.GroundPicture.NewElement extends Pettanr.View initialize: (options) -> @parent = options.parent diff --git a/app/assets/javascripts/views/ground_pictures/show.js.coffee b/app/assets/javascripts/views/ground_pictures/show.js.coffee index 71202018..a438509b 100644 --- a/app/assets/javascripts/views/ground_pictures/show.js.coffee +++ b/app/assets/javascripts/views/ground_pictures/show.js.coffee @@ -4,7 +4,7 @@ class Pettanr.Views.GroundPicture.ShowModule.Header extends Pettanr.Views.Show.H initialize: (options) -> super(options) -class Pettanr.Views.GroundPicture.Show extends Backbone.View +class Pettanr.Views.GroundPicture.Show extends Pettanr.View tagName: 'div' className: 'show' @@ -55,8 +55,7 @@ class Pettanr.Views.GroundPicture.Show extends Backbone.View this.$el.append(@author.render().el) this.$el.append(@body.render().el) this.$el.append(@credits.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() click_show: () -> @trigger('http_get', @item.show_url()) diff --git a/app/assets/javascripts/views/history.js.coffee b/app/assets/javascripts/views/history.js.coffee index 5a07ce66..384732b3 100644 --- a/app/assets/javascripts/views/history.js.coffee +++ b/app/assets/javascripts/views/history.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.History extends Backbone.View +class Pettanr.Views.History extends Pettanr.View tagName: 'div' className: 'history' @@ -36,7 +36,7 @@ class Pettanr.Views.History extends Backbone.View click_log: (log) -> @trigger('get', log.params, null) -class Pettanr.Views.History.List extends Backbone.View +class Pettanr.Views.History.List extends Pettanr.View tagName: 'div' className: 'history-list' @@ -68,7 +68,7 @@ class Pettanr.Views.History.List extends Backbone.View click_log: (log) -> @trigger('click:log', log) -class Pettanr.Views.History.List.Log extends Backbone.View +class Pettanr.Views.History.List.Log extends Pettanr.View tagName: 'div' className: 'history-list-log' @@ -112,7 +112,7 @@ class Pettanr.Views.History.List.Log extends Backbone.View click: () -> @trigger('click', this) -class Pettanr.Views.History.Root extends Backbone.View +class Pettanr.Views.History.Root extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/home/show.js.coffee b/app/assets/javascripts/views/home/show.js.coffee index 548dcfa1..1d398ea4 100644 --- a/app/assets/javascripts/views/home/show.js.coffee +++ b/app/assets/javascripts/views/home/show.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.Home.Configure extends Backbone.View +class Pettanr.Views.Home.Configure extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/layout.js.coffee b/app/assets/javascripts/views/layout.js.coffee index 0d984b7b..470e6699 100644 --- a/app/assets/javascripts/views/layout.js.coffee +++ b/app/assets/javascripts/views/layout.js.coffee @@ -1,5 +1,5 @@ class Pettanr.Views.Layout -class Pettanr.Views.Layout.Base extends Backbone.View +class Pettanr.Views.Layout.Base extends Pettanr.View class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base className: 'layout-sns' @@ -19,8 +19,7 @@ class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base this.$el.html('') this.$el.append(@header.render().el) this.$el.append(@history.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this.$el.append(@body.render().el) this.$el.append(@footer.render().el) this diff --git a/app/assets/javascripts/views/layouts/blog.js.coffee b/app/assets/javascripts/views/layouts/blog.js.coffee index 9a166228..03775922 100644 --- a/app/assets/javascripts/views/layouts/blog.js.coffee +++ b/app/assets/javascripts/views/layouts/blog.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.Layout.Blog.Header extends Backbone.View +class Pettanr.Views.Layout.Blog.Header extends Pettanr.View tagName: 'div' id: 'header' @@ -35,7 +35,7 @@ class Pettanr.Views.Layout.Blog.Header extends Backbone.View @router.navigate(url, {trigger: true, replace: false}) @trigger('navigate', url) -class Pettanr.Views.Layout.Blog.Body extends Backbone.View +class Pettanr.Views.Layout.Blog.Body extends Pettanr.View tagName: 'div' id: 'body' @@ -68,7 +68,7 @@ class Pettanr.Views.Layout.Blog.Body extends Backbone.View @router.navigate(url, {trigger: true, replace: false}) @trigger('navigate', url) -class Pettanr.Views.Layout.Blog.Footer extends Backbone.View +class Pettanr.Views.Layout.Blog.Footer extends Pettanr.View tagName: 'div' id: 'footer' diff --git a/app/assets/javascripts/views/layouts/sns.js.coffee b/app/assets/javascripts/views/layouts/sns.js.coffee index 7ef2b094..c82ec6c3 100644 --- a/app/assets/javascripts/views/layouts/sns.js.coffee +++ b/app/assets/javascripts/views/layouts/sns.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.Layout.Sns.Header extends Backbone.View +class Pettanr.Views.Layout.Sns.Header extends Pettanr.View tagName: 'div' id: 'header' @@ -12,7 +12,7 @@ class Pettanr.Views.Layout.Sns.Header extends Backbone.View refresh: (view) -> this.$el.html(view.el) -class Pettanr.Views.Layout.Sns.Body extends Backbone.View +class Pettanr.Views.Layout.Sns.Body extends Pettanr.View tagName: 'div' id: 'body' @@ -26,7 +26,7 @@ class Pettanr.Views.Layout.Sns.Body extends Backbone.View refresh: (view) -> this.$el.html(view.el) -class Pettanr.Views.Layout.Sns.Footer extends Backbone.View +class Pettanr.Views.Layout.Sns.Footer extends Pettanr.View tagName: 'div' id: 'footer' diff --git a/app/assets/javascripts/views/license_groups/show.js.coffee b/app/assets/javascripts/views/license_groups/show.js.coffee index 0c458399..dd0283d7 100644 --- a/app/assets/javascripts/views/license_groups/show.js.coffee +++ b/app/assets/javascripts/views/license_groups/show.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.LicenseGroup.Show extends Backbone.View +class Pettanr.Views.LicenseGroup.Show extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/licenses/show.js.coffee b/app/assets/javascripts/views/licenses/show.js.coffee index 746edbe3..292aeb41 100644 --- a/app/assets/javascripts/views/licenses/show.js.coffee +++ b/app/assets/javascripts/views/licenses/show.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.License.Show extends Backbone.View +class Pettanr.Views.License.Show extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/original_pictures/img.js.coffee b/app/assets/javascripts/views/original_pictures/img.js.coffee index ad1b748c..72c4d73c 100644 --- a/app/assets/javascripts/views/original_pictures/img.js.coffee +++ b/app/assets/javascripts/views/original_pictures/img.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.OriginalPicture.Img extends Backbone.View +class Pettanr.Views.OriginalPicture.Img extends Pettanr.View tagName: 'img' initialize: (options) -> diff --git a/app/assets/javascripts/views/original_pictures/publish.js.coffee b/app/assets/javascripts/views/original_pictures/publish.js.coffee index e9ea5764..9076a674 100644 --- a/app/assets/javascripts/views/original_pictures/publish.js.coffee +++ b/app/assets/javascripts/views/original_pictures/publish.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.OriginalPicture.Publish extends Backbone.View +class Pettanr.Views.OriginalPicture.Publish extends Pettanr.View initialize: (options) -> super(options) diff --git a/app/assets/javascripts/views/original_pictures/show.js.coffee b/app/assets/javascripts/views/original_pictures/show.js.coffee index 794bbde4..940f1727 100644 --- a/app/assets/javascripts/views/original_pictures/show.js.coffee +++ b/app/assets/javascripts/views/original_pictures/show.js.coffee @@ -31,7 +31,7 @@ class Pettanr.Views.OriginalPicture.ShowModule.LinkedDropButton extends Tag.A content: I18n.t('link.destroy') }) -class Pettanr.Views.OriginalPicture.ShowModule.OwnerFooter extends Backbone.View +class Pettanr.Views.OriginalPicture.ShowModule.OwnerFooter extends Pettanr.View tagName: 'div' className: 'show-owner-footer' @@ -78,7 +78,7 @@ class Pettanr.Views.OriginalPicture.ShowModule.Owner extends Pettanr.Views.Show. footer_class: () -> Pettanr.Views.OriginalPicture.ShowModule.OwnerFooter -class Pettanr.Views.OriginalPicture.ShowModule.History extends Backbone.View +class Pettanr.Views.OriginalPicture.ShowModule.History extends Pettanr.View initialize: (options) -> super(options) @@ -101,7 +101,7 @@ class Pettanr.Views.OriginalPicture.ShowModule.History extends Backbone.View http_get: (url) -> @trigger('http_get', url) -class Pettanr.Views.OriginalPicture.Show extends Backbone.View +class Pettanr.Views.OriginalPicture.Show extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/original_pictures/summary.js.coffee b/app/assets/javascripts/views/original_pictures/summary.js.coffee index 6ac68e63..3418eaa4 100644 --- a/app/assets/javascripts/views/original_pictures/summary.js.coffee +++ b/app/assets/javascripts/views/original_pictures/summary.js.coffee @@ -24,8 +24,7 @@ class Pettanr.Views.OriginalPicture.Summary extends Pettanr.Views.Common.Summary @listenTo(@credit, 'click:icon', @resource_picture_click) this.$el.append(@credit.render().el) ) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this # in credit diff --git a/app/assets/javascripts/views/panel_pictures/element.js.coffee b/app/assets/javascripts/views/panel_pictures/element.js.coffee index a36768d2..54438b5c 100644 --- a/app/assets/javascripts/views/panel_pictures/element.js.coffee +++ b/app/assets/javascripts/views/panel_pictures/element.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.PanelPicture.Element extends Backbone.View +class Pettanr.Views.PanelPicture.Element extends Pettanr.View tagName: 'div' className: 'pettanr-panel-picture-wrapper' @@ -48,7 +48,7 @@ class Pettanr.Views.PanelPicture.Element extends Backbone.View img_class: () -> Pettanr.Views.PanelPicture.Element.Img -class Pettanr.Views.PanelPicture.Element.Img extends Backbone.View +class Pettanr.Views.PanelPicture.Element.Img extends Pettanr.View tagName: 'img' initialize: (options) -> diff --git a/app/assets/javascripts/views/panel_pictures/element_face.js.coffee b/app/assets/javascripts/views/panel_pictures/element_face.js.coffee index 0bfc8f8c..55a20f16 100644 --- a/app/assets/javascripts/views/panel_pictures/element_face.js.coffee +++ b/app/assets/javascripts/views/panel_pictures/element_face.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.PanelPicture.ElementSymbol extends Backbone.View +class Pettanr.Views.PanelPicture.ElementSymbol extends Pettanr.View tagName: 'div' className: 'elements-tab-face-icon' @@ -16,7 +16,7 @@ class Pettanr.Views.PanelPicture.ElementSymbol extends Backbone.View img = @element.tmb_opt_img_tag(@picture) this.$el.html(img.render().el) -class Pettanr.Views.PanelPicture.ElementFace extends Backbone.View +class Pettanr.Views.PanelPicture.ElementFace extends Pettanr.View tagName: 'div' className: 'elements-tab' diff --git a/app/assets/javascripts/views/panel_pictures/new_element.js.coffee b/app/assets/javascripts/views/panel_pictures/new_element.js.coffee index e3e22cd5..e7bec5d1 100644 --- a/app/assets/javascripts/views/panel_pictures/new_element.js.coffee +++ b/app/assets/javascripts/views/panel_pictures/new_element.js.coffee @@ -71,7 +71,7 @@ class Pettanr.Views.PanelPicture.NewElementLauncher extends Editor.EditorModule. click_artists: () -> @click_default(@links_conf.artists.params) -class Pettanr.Views.PanelPicture.NewElement extends Backbone.View +class Pettanr.Views.PanelPicture.NewElement extends Pettanr.View initialize: (options) -> @parent = options.parent diff --git a/app/assets/javascripts/views/panel_pictures/show.js.coffee b/app/assets/javascripts/views/panel_pictures/show.js.coffee index 6fe4c540..769c6a9c 100644 --- a/app/assets/javascripts/views/panel_pictures/show.js.coffee +++ b/app/assets/javascripts/views/panel_pictures/show.js.coffee @@ -4,7 +4,7 @@ class Pettanr.Views.PanelPicture.ShowModule.Header extends Pettanr.Views.Show.He initialize: (options) -> super(options) -class Pettanr.Views.PanelPicture.Show extends Backbone.View +class Pettanr.Views.PanelPicture.Show extends Pettanr.View tagName: 'div' className: 'show' @@ -55,8 +55,7 @@ class Pettanr.Views.PanelPicture.Show extends Backbone.View this.$el.append(@author.render().el) this.$el.append(@body.render().el) this.$el.append(@credits.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() click_show: () -> @trigger('http_get', @item.show_url()) diff --git a/app/assets/javascripts/views/panels/body.js.coffee b/app/assets/javascripts/views/panels/body.js.coffee index 3de98bb6..c813b8af 100644 --- a/app/assets/javascripts/views/panels/body.js.coffee +++ b/app/assets/javascripts/views/panels/body.js.coffee @@ -1,6 +1,6 @@ # panel: panel item # spot: no opacity element -class Pettanr.Views.Panel.Body extends Backbone.View +class Pettanr.Views.Panel.Body extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -112,7 +112,7 @@ class Pettanr.Views.Panel.Body.Edit extends Pettanr.Views.Panel.Body element_class: (element) -> Pettanr.Views[element.singular()].Element.Edit -class Pettanr.Views.Panel.Footer extends Backbone.View +class Pettanr.Views.Panel.Footer extends Pettanr.View tagName: 'table' className: 'no-border' diff --git a/app/assets/javascripts/views/panels/show.js.coffee b/app/assets/javascripts/views/panels/show.js.coffee index 09665637..9b5b1e27 100644 --- a/app/assets/javascripts/views/panels/show.js.coffee +++ b/app/assets/javascripts/views/panels/show.js.coffee @@ -9,7 +9,7 @@ class Pettanr.Views.Panel.ShowModule.Owner extends Pettanr.Views.Show.Owner initialize: (options) -> super(options) -class Pettanr.Views.Panel.ShowModule.Credits extends Backbone.View +class Pettanr.Views.Panel.ShowModule.Credits extends Pettanr.View tagName: 'div' className: 'credits' @@ -49,7 +49,7 @@ class Pettanr.Views.Panel.ShowModule.Credits extends Backbone.View # panel: panel item # spot: no opacity element -class Pettanr.Views.Panel.Show extends Backbone.View +class Pettanr.Views.Panel.Show extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -92,8 +92,7 @@ class Pettanr.Views.Panel.Show extends Backbone.View this.$el.append(@body.render().el) this.$el.append(@footer.render().el) this.$el.append(@credits.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this.$el.append(@owner.render().el) this diff --git a/app/assets/javascripts/views/pictures/credit.js.coffee b/app/assets/javascripts/views/pictures/credit.js.coffee index 1212440f..1de33a27 100644 --- a/app/assets/javascripts/views/pictures/credit.js.coffee +++ b/app/assets/javascripts/views/pictures/credit.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.Picture.Credit extends Backbone.View +class Pettanr.Views.Picture.Credit extends Pettanr.View tagName: 'div' className: 'credit' @@ -15,8 +15,7 @@ class Pettanr.Views.Picture.Credit extends Backbone.View this.$el.append(p.render().el) f = (data, status) => this.$el.append(data) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() $.get(@url, null, f, 'html') this diff --git a/app/assets/javascripts/views/pictures/credit_icon.js.coffee b/app/assets/javascripts/views/pictures/credit_icon.js.coffee index 30aa5e73..d8634115 100644 --- a/app/assets/javascripts/views/pictures/credit_icon.js.coffee +++ b/app/assets/javascripts/views/pictures/credit_icon.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.Picture.CreditIcon extends Backbone.View +class Pettanr.Views.Picture.CreditIcon extends Pettanr.View tagName: 'span' className: 'credit-icon' diff --git a/app/assets/javascripts/views/pictures/history.js.coffee b/app/assets/javascripts/views/pictures/history.js.coffee index 9546fe8c..16b6c9a0 100644 --- a/app/assets/javascripts/views/pictures/history.js.coffee +++ b/app/assets/javascripts/views/pictures/history.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.Picture.History extends Backbone.View +class Pettanr.Views.Picture.History extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/pictures/show.js.coffee b/app/assets/javascripts/views/pictures/show.js.coffee index 89eb463e..46a940ab 100644 --- a/app/assets/javascripts/views/pictures/show.js.coffee +++ b/app/assets/javascripts/views/pictures/show.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.Picture.Show extends Backbone.View +class Pettanr.Views.Picture.Show extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/resource_picture_pictures/show.js.coffee b/app/assets/javascripts/views/resource_picture_pictures/show.js.coffee index aee19282..2e8c8430 100644 --- a/app/assets/javascripts/views/resource_picture_pictures/show.js.coffee +++ b/app/assets/javascripts/views/resource_picture_pictures/show.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.ResourcePicturePicture.Show extends Backbone.View +class Pettanr.Views.ResourcePicturePicture.Show extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/resource_pictures/credit.js.coffee b/app/assets/javascripts/views/resource_pictures/credit.js.coffee index 964c49e5..7974c880 100644 --- a/app/assets/javascripts/views/resource_pictures/credit.js.coffee +++ b/app/assets/javascripts/views/resource_pictures/credit.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.ResourcePicture.Credit extends Backbone.View +class Pettanr.Views.ResourcePicture.Credit extends Pettanr.View tagName: 'div' className: 'credit' @@ -15,8 +15,7 @@ class Pettanr.Views.ResourcePicture.Credit extends Backbone.View this.$el.append(p.render().el) f = (data, status) => this.$el.append(data) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() $.get(@url, null, f, 'html') this diff --git a/app/assets/javascripts/views/resource_pictures/credit_icon.js.coffee b/app/assets/javascripts/views/resource_pictures/credit_icon.js.coffee index 2491c275..7a0ea278 100644 --- a/app/assets/javascripts/views/resource_pictures/credit_icon.js.coffee +++ b/app/assets/javascripts/views/resource_pictures/credit_icon.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.ResourcePicture.CreditIcon extends Backbone.View +class Pettanr.Views.ResourcePicture.CreditIcon extends Pettanr.View tagName: 'span' className: 'credit-icon' diff --git a/app/assets/javascripts/views/resource_pictures/form.js.coffee b/app/assets/javascripts/views/resource_pictures/form.js.coffee index d8b996d4..a8dbfce0 100644 --- a/app/assets/javascripts/views/resource_pictures/form.js.coffee +++ b/app/assets/javascripts/views/resource_pictures/form.js.coffee @@ -1,7 +1,7 @@ # # Confirm page # -class Pettanr.Views.ResourcePicture.Form extends Backbone.View +class Pettanr.Views.ResourcePicture.Form extends Pettanr.View initialize: (options) -> super(options) diff --git a/app/assets/javascripts/views/resource_pictures/img.js.coffee b/app/assets/javascripts/views/resource_pictures/img.js.coffee index 1fb5ecd8..3d4a6207 100644 --- a/app/assets/javascripts/views/resource_pictures/img.js.coffee +++ b/app/assets/javascripts/views/resource_pictures/img.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.ResourcePicture.Img extends Backbone.View +class Pettanr.Views.ResourcePicture.Img extends Pettanr.View tagName: 'img' initialize: (options) -> diff --git a/app/assets/javascripts/views/resource_pictures/show.js.coffee b/app/assets/javascripts/views/resource_pictures/show.js.coffee index 075573ae..06885e8a 100644 --- a/app/assets/javascripts/views/resource_pictures/show.js.coffee +++ b/app/assets/javascripts/views/resource_pictures/show.js.coffee @@ -33,7 +33,7 @@ class Pettanr.Views.ResourcePicture.ShowModule.LinkedStopButton extends Tag.A content: I18n.t('original_pictures.index.stop') }) -class Pettanr.Views.ResourcePicture.ShowModule.OwnerFooter extends Backbone.View +class Pettanr.Views.ResourcePicture.ShowModule.OwnerFooter extends Pettanr.View tagName: 'div' className: 'show-owner-footer' @@ -83,7 +83,7 @@ class Pettanr.Views.ResourcePicture.ShowModule.Owner extends Pettanr.Views.Show. footer_class: () -> Pettanr.Views.ResourcePicture.ShowModule.OwnerFooter -class Pettanr.Views.ResourcePicture.Show extends Backbone.View +class Pettanr.Views.ResourcePicture.Show extends Pettanr.View tagName: 'div' className: 'show' diff --git a/app/assets/javascripts/views/scroll_panels/new_element.js.coffee b/app/assets/javascripts/views/scroll_panels/new_element.js.coffee index b1ec8060..d9e0cc99 100644 --- a/app/assets/javascripts/views/scroll_panels/new_element.js.coffee +++ b/app/assets/javascripts/views/scroll_panels/new_element.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.ScrollPanel.NewElementLauncher extends Backbone.View +class Pettanr.Views.ScrollPanel.NewElementLauncher extends Pettanr.View initialize: (options) -> @parent = options.parent diff --git a/app/assets/javascripts/views/scrolls/play.js.coffee b/app/assets/javascripts/views/scrolls/play.js.coffee index f30114f2..afc57730 100644 --- a/app/assets/javascripts/views/scrolls/play.js.coffee +++ b/app/assets/javascripts/views/scrolls/play.js.coffee @@ -9,7 +9,7 @@ class Pettanr.Views.Scroll.PlayModule.Owner extends Pettanr.Views.Show.Owner initialize: (options) -> super(options) -class Pettanr.Views.Scroll.PlayModule.FooterSwitch extends Backbone.View +class Pettanr.Views.Scroll.PlayModule.FooterSwitch extends Pettanr.View tagName: 'div' className: 'player-item-switch' events: { @@ -53,7 +53,7 @@ class Pettanr.Views.Scroll.PlayModule.FooterSwitch extends Backbone.View @visible = false @render() -class Pettanr.Views.Scroll.PlayModule.Footer extends Backbone.View +class Pettanr.Views.Scroll.PlayModule.Footer extends Pettanr.View tagName: 'div' className: 'player-item-footer' @@ -97,11 +97,9 @@ class Pettanr.Views.Scroll.PlayModule.Footer extends Backbone.View this.$el.append(l2.render().el) if @scroll.is_own() this.$el.append(@insert_button.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this.$el.append(@move_button.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this.$el.append(@destroy_button.render().el) hide: () -> @@ -131,7 +129,7 @@ class Pettanr.Views.Scroll.PlayModule.Footer extends Backbone.View click_destroy: () -> @trigger('click:destroy') -class Pettanr.Views.Scroll.PlayModule.Credits extends Backbone.View +class Pettanr.Views.Scroll.PlayModule.Credits extends Pettanr.View tagName: 'div' className: 'credits' @@ -159,7 +157,7 @@ class Pettanr.Views.Scroll.PlayModule.Credits extends Backbone.View click_credit_icon: (item) -> @trigger('click:credit:icon', item) -class Pettanr.Views.Scroll.PlayModule.PanelBody extends Backbone.View +class Pettanr.Views.Scroll.PlayModule.PanelBody extends Pettanr.View tagName: 'div' className: 'player-item-panel' @@ -175,7 +173,7 @@ class Pettanr.Views.Scroll.PlayModule.PanelBody extends Backbone.View this.$el.append(body.render().el) this -class Pettanr.Views.Scroll.PlayModule.Panel extends Backbone.View +class Pettanr.Views.Scroll.PlayModule.Panel extends Pettanr.View tagName: 'li' className: 'player-item' @@ -226,8 +224,7 @@ class Pettanr.Views.Scroll.PlayModule.Panel extends Backbone.View @listenTo(@footer, 'click:edit', @click_edit) @listenTo(@footer, 'click:destroy', @click_destroy) this.$el.append(@insert_point.clear().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this.$el.append(body.render().el) this.$el.append(@footer_switch.render().el) this.$el.append(@footer.render().el) @@ -299,7 +296,7 @@ class Pettanr.Views.Scroll.PlayModule.InsertPoint extends Tag.Div attr = {style: Pettanr.to_style(style)} this.$el.attr(attr) -class Pettanr.Views.Scroll.PlayModule.Panels extends Backbone.View +class Pettanr.Views.Scroll.PlayModule.Panels extends Pettanr.View tagName: 'ul' className: 'player' @@ -484,7 +481,7 @@ class Pettanr.Views.Scroll.PlayModule.Append extends Tag.Div click: () -> @trigger('click') -class Pettanr.Views.Scroll.PlayModule.Body extends Backbone.View +class Pettanr.Views.Scroll.PlayModule.Body extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -518,8 +515,7 @@ class Pettanr.Views.Scroll.PlayModule.Body extends Backbone.View @listenTo(@panels, 'dialog:close', @close_dialog) @listenTo(@pager, 'page', @continue) this.$el.append(@panels.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() @appender = new Pettanr.Views.Scroll.PlayModule.Append({ }) @listenTo(@appender, 'click', @click_append) @@ -528,8 +524,7 @@ class Pettanr.Views.Scroll.PlayModule.Body extends Backbone.View @appender.enable() this.$el.append(@pager.render().el) this.$el.append(credits.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this click_credit_icon: (item) -> @@ -569,7 +564,7 @@ class Pettanr.Views.Scroll.PlayModule.Body extends Backbone.View @appender.enable() ) -class Pettanr.Views.Scroll.Play extends Backbone.View +class Pettanr.Views.Scroll.Play extends Pettanr.View tagName: 'div' className: 'show' diff --git a/app/assets/javascripts/views/scrolls/show.js.coffee b/app/assets/javascripts/views/scrolls/show.js.coffee index e2880c81..e926f416 100644 --- a/app/assets/javascripts/views/scrolls/show.js.coffee +++ b/app/assets/javascripts/views/scrolls/show.js.coffee @@ -9,7 +9,7 @@ class Pettanr.Views.Scroll.ShowModule.Owner extends Pettanr.Views.Show.Owner initialize: (options) -> super(options) -class Pettanr.Views.Scroll.Show extends Backbone.View +class Pettanr.Views.Scroll.Show extends Pettanr.View tagName: 'div' className: 'show' diff --git a/app/assets/javascripts/views/sheets/play.js.coffee b/app/assets/javascripts/views/sheets/play.js.coffee index 5d20e34c..6ea69243 100644 --- a/app/assets/javascripts/views/sheets/play.js.coffee +++ b/app/assets/javascripts/views/sheets/play.js.coffee @@ -9,7 +9,7 @@ class Pettanr.Views.Sheet.PlayModule.Owner extends Pettanr.Views.Show.Owner initialize: (options) -> super(options) -class Pettanr.Views.Sheet.PlayModule.Footer extends Backbone.View +class Pettanr.Views.Sheet.PlayModule.Footer extends Pettanr.View tagName: 'table' className: 'no-border' @@ -39,7 +39,7 @@ class Pettanr.Views.Sheet.PlayModule.Footer extends Backbone.View this.$el.append('') this -class Pettanr.Views.Sheet.PlayModule.Credits extends Backbone.View +class Pettanr.Views.Sheet.PlayModule.Credits extends Pettanr.View tagName: 'div' className: 'credits' @@ -62,7 +62,7 @@ class Pettanr.Views.Sheet.PlayModule.Credits extends Backbone.View credit = picture.credit_view() this.$el.append(credit.render().el) -class Pettanr.Views.Sheet.PlayModule.Panel extends Backbone.View +class Pettanr.Views.Sheet.PlayModule.Panel extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -93,7 +93,7 @@ class Pettanr.Views.Sheet.PlayModule.Panel extends Backbone.View this.credits.push(@panel.licensed_pictures()) this -class Pettanr.Views.Sheet.PlayModule.Panels extends Backbone.View +class Pettanr.Views.Sheet.PlayModule.Panels extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -111,7 +111,7 @@ class Pettanr.Views.Sheet.PlayModule.Panels extends Backbone.View this.$el.append(panel_view.render().el) this -class Pettanr.Views.Sheet.PlayModule.Body extends Backbone.View +class Pettanr.Views.Sheet.PlayModule.Body extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -139,12 +139,11 @@ class Pettanr.Views.Sheet.PlayModule.Body extends Backbone.View }) this.$el.append(panels.render().el) this.$el.append(credits.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() # paginate(@pager) this -class Pettanr.Views.Sheet.Play extends Backbone.View +class Pettanr.Views.Sheet.Play extends Pettanr.View tagName: 'div' className: 'show' diff --git a/app/assets/javascripts/views/sheets/show.js.coffee b/app/assets/javascripts/views/sheets/show.js.coffee index 048f8b9f..0811a79d 100644 --- a/app/assets/javascripts/views/sheets/show.js.coffee +++ b/app/assets/javascripts/views/sheets/show.js.coffee @@ -9,7 +9,7 @@ class Pettanr.Views.Sheet.ShowModule.Owner extends Pettanr.Views.Show.Owner initialize: (options) -> super(options) -class Pettanr.Views.Sheet.Show extends Backbone.View +class Pettanr.Views.Sheet.Show extends Pettanr.View tagName: 'div' className: 'show' diff --git a/app/assets/javascripts/views/show.js.coffee b/app/assets/javascripts/views/show.js.coffee index 67704f38..1be2f81b 100644 --- a/app/assets/javascripts/views/show.js.coffee +++ b/app/assets/javascripts/views/show.js.coffee @@ -1,5 +1,5 @@ class Pettanr.Views.Show -class Pettanr.Views.Show.Header extends Backbone.View +class Pettanr.Views.Show.Header extends Pettanr.View tagName: 'h1' className: 'show-header' @@ -59,7 +59,7 @@ class Pettanr.Views.Show.Header extends Backbone.View @listenTo(@pick, 'click', @click_pick) @render() -class Pettanr.Views.Show.HeaderAuthor extends Backbone.View +class Pettanr.Views.Show.HeaderAuthor extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -87,7 +87,7 @@ class Pettanr.Views.Show.HeaderAuthor extends Backbone.View click: () -> @trigger('click:author') -class Pettanr.Views.Show.HeaderArtist extends Backbone.View +class Pettanr.Views.Show.HeaderArtist extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -158,7 +158,7 @@ class Pettanr.Views.Show.LinkedInspireIcon extends Tag.A content: img.render().el }) -class Pettanr.Views.Show.OwnerFooter extends Backbone.View +class Pettanr.Views.Show.OwnerFooter extends Pettanr.View tagName: 'div' className: 'show-owner-footer' @@ -182,7 +182,7 @@ class Pettanr.Views.Show.OwnerFooter extends Backbone.View click_destroy: () -> @trigger('click:destroy') -class Pettanr.Views.Show.Owner extends Backbone.View +class Pettanr.Views.Show.Owner extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/speech_balloon_templates/show.js.coffee b/app/assets/javascripts/views/speech_balloon_templates/show.js.coffee index 3a1c86f5..ab3fb3c6 100644 --- a/app/assets/javascripts/views/speech_balloon_templates/show.js.coffee +++ b/app/assets/javascripts/views/speech_balloon_templates/show.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.SpeechBalloonTemplate.Show extends Backbone.View +class Pettanr.Views.SpeechBalloonTemplate.Show extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/speech_balloons/element.js.coffee b/app/assets/javascripts/views/speech_balloons/element.js.coffee index 8eee1f50..017942ca 100644 --- a/app/assets/javascripts/views/speech_balloons/element.js.coffee +++ b/app/assets/javascripts/views/speech_balloons/element.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.SpeechBalloon.Element extends Backbone.View +class Pettanr.Views.SpeechBalloon.Element extends Pettanr.View tagName: 'div' className: 'pettanr-comic-balloon' diff --git a/app/assets/javascripts/views/speech_balloons/element_face.js.coffee b/app/assets/javascripts/views/speech_balloons/element_face.js.coffee index 464b74a2..42595c69 100644 --- a/app/assets/javascripts/views/speech_balloons/element_face.js.coffee +++ b/app/assets/javascripts/views/speech_balloons/element_face.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.SpeechBalloon.ElementSymbol extends Backbone.View +class Pettanr.Views.SpeechBalloon.ElementSymbol extends Pettanr.View tagName: 'div' className: 'elements-tab-face-icon' @@ -21,7 +21,7 @@ class Pettanr.Views.SpeechBalloon.ElementSymbol extends Backbone.View img = @system_picture.tmb_opt_img_tag() this.$el.html(img.render().el) -class Pettanr.Views.SpeechBalloon.ElementFace extends Backbone.View +class Pettanr.Views.SpeechBalloon.ElementFace extends Pettanr.View tagName: 'div' className: 'elements-tab' @@ -32,7 +32,6 @@ class Pettanr.Views.SpeechBalloon.ElementFace extends Backbone.View this.$el.html('') symbol = new Pettanr.Views.SpeechBalloon.ElementSymbol({element: @element}) this.$el.append(symbol.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() this diff --git a/app/assets/javascripts/views/speech_balloons/new_element.js.coffee b/app/assets/javascripts/views/speech_balloons/new_element.js.coffee index 5ef8ee25..976acb3b 100644 --- a/app/assets/javascripts/views/speech_balloons/new_element.js.coffee +++ b/app/assets/javascripts/views/speech_balloons/new_element.js.coffee @@ -46,7 +46,7 @@ class Pettanr.Views.SpeechBalloon.NewElementLauncher extends Editor.EditorModule click_inspire_my_recent: () -> @click_default(@links_conf.inspire_my_recent.params) -class Pettanr.Views.SpeechBalloon.NewElement extends Backbone.View +class Pettanr.Views.SpeechBalloon.NewElement extends Pettanr.View initialize: (options) -> @parent = options.parent diff --git a/app/assets/javascripts/views/speech_balloons/show.js.coffee b/app/assets/javascripts/views/speech_balloons/show.js.coffee index 987c8f16..ef08dd42 100644 --- a/app/assets/javascripts/views/speech_balloons/show.js.coffee +++ b/app/assets/javascripts/views/speech_balloons/show.js.coffee @@ -4,7 +4,7 @@ class Pettanr.Views.SpeechBalloon.ShowModule.Header extends Pettanr.Views.Show.H initialize: (options) -> super(options) -class Pettanr.Views.SpeechBalloon.Show extends Backbone.View +class Pettanr.Views.SpeechBalloon.Show extends Pettanr.View tagName: 'div' className: 'show' @@ -55,8 +55,7 @@ class Pettanr.Views.SpeechBalloon.Show extends Backbone.View this.$el.append(@author.render().el) this.$el.append(@body.render().el) this.$el.append(@credits.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() click_show: () -> @trigger('http_get', @item.show_url()) diff --git a/app/assets/javascripts/views/speeches/element.js.coffee b/app/assets/javascripts/views/speeches/element.js.coffee index 425d6add..6993faf1 100644 --- a/app/assets/javascripts/views/speeches/element.js.coffee +++ b/app/assets/javascripts/views/speeches/element.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.Speech.Element extends Backbone.View +class Pettanr.Views.Speech.Element extends Pettanr.View tagName: 'div' className: 'pettanr-comic-speech' @@ -41,7 +41,7 @@ class Pettanr.Views.Speech.Element extends Backbone.View inner_class: () -> Pettanr.Views.Speech.Element.Inner -class Pettanr.Views.Speech.Element.Inner extends Backbone.View +class Pettanr.Views.Speech.Element.Inner extends Pettanr.View tagName: 'div' className: 'pettanr-comic-speech-inner' diff --git a/app/assets/javascripts/views/speeches/show.js.coffee b/app/assets/javascripts/views/speeches/show.js.coffee index e037c987..0f32ba79 100644 --- a/app/assets/javascripts/views/speeches/show.js.coffee +++ b/app/assets/javascripts/views/speeches/show.js.coffee @@ -4,7 +4,7 @@ class Pettanr.Views.Speech.ShowModule.Header extends Pettanr.Views.Show.Header initialize: (options) -> super(options) -class Pettanr.Views.Speech.Show extends Backbone.View +class Pettanr.Views.Speech.Show extends Pettanr.View tagName: 'div' className: 'show' @@ -60,8 +60,7 @@ class Pettanr.Views.Speech.Show extends Backbone.View this.$el.append(@author.render().el) this.$el.append(@body.render().el) this.$el.append(@credits.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @rb() click_show: () -> @trigger('http_get', @item.show_url()) diff --git a/app/assets/javascripts/views/stories/play.js.coffee b/app/assets/javascripts/views/stories/play.js.coffee index aae55dd0..e631644e 100644 --- a/app/assets/javascripts/views/stories/play.js.coffee +++ b/app/assets/javascripts/views/stories/play.js.coffee @@ -9,7 +9,7 @@ class Pettanr.Views.Story.PlayModule.Owner extends Pettanr.Views.Show.Owner initialize: (options) -> super(options) -class Pettanr.Views.Story.PlayModule.Footer extends Backbone.View +class Pettanr.Views.Story.PlayModule.Footer extends Pettanr.View tagName: 'table' className: 'no-border' @@ -39,7 +39,7 @@ class Pettanr.Views.Story.PlayModule.Footer extends Backbone.View this.$el.append('') this -class Pettanr.Views.Story.PlayModule.Credits extends Backbone.View +class Pettanr.Views.Story.PlayModule.Credits extends Pettanr.View tagName: 'div' className: 'credits' @@ -62,7 +62,7 @@ class Pettanr.Views.Story.PlayModule.Credits extends Backbone.View credit = picture.credit_view() this.$el.append(credit.render().el) -class Pettanr.Views.Story.PlayModule.Sheet extends Backbone.View +class Pettanr.Views.Story.PlayModule.Sheet extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -83,7 +83,7 @@ class Pettanr.Views.Story.PlayModule.Sheet extends Backbone.View this.$el.append(body.render().el) this -class Pettanr.Views.Story.PlayModule.Sheets extends Backbone.View +class Pettanr.Views.Story.PlayModule.Sheets extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -100,7 +100,7 @@ class Pettanr.Views.Story.PlayModule.Sheets extends Backbone.View this.$el.append(sheet_view.render().el) this -class Pettanr.Views.Story.PlayModule.Body extends Backbone.View +class Pettanr.Views.Story.PlayModule.Body extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -128,7 +128,7 @@ class Pettanr.Views.Story.PlayModule.Body extends Backbone.View # paginate(@pager) this -class Pettanr.Views.Story.Play extends Backbone.View +class Pettanr.Views.Story.Play extends Pettanr.View tagName: 'div' className: 'show' diff --git a/app/assets/javascripts/views/stories/show.js.coffee b/app/assets/javascripts/views/stories/show.js.coffee index 3b731d14..512bd69f 100644 --- a/app/assets/javascripts/views/stories/show.js.coffee +++ b/app/assets/javascripts/views/stories/show.js.coffee @@ -9,7 +9,7 @@ class Pettanr.Views.Story.ShowModule.Owner extends Pettanr.Views.Show.Owner initialize: (options) -> super(options) -class Pettanr.Views.Story.Show extends Backbone.View +class Pettanr.Views.Story.Show extends Pettanr.View tagName: 'div' className: 'show' diff --git a/app/assets/javascripts/views/system_pictures/show.js.coffee b/app/assets/javascripts/views/system_pictures/show.js.coffee index d23d745d..7f2172e0 100644 --- a/app/assets/javascripts/views/system_pictures/show.js.coffee +++ b/app/assets/javascripts/views/system_pictures/show.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.SystemPicture.Show extends Backbone.View +class Pettanr.Views.SystemPicture.Show extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/top/demo.js.coffee b/app/assets/javascripts/views/top/demo.js.coffee index 76fffad1..e59de20a 100644 --- a/app/assets/javascripts/views/top/demo.js.coffee +++ b/app/assets/javascripts/views/top/demo.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.Top.Demo extends Backbone.View +class Pettanr.Views.Top.Demo extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/user_sessions/new.js.coffee b/app/assets/javascripts/views/user_sessions/new.js.coffee index 5e4d90cd..73c79ed8 100644 --- a/app/assets/javascripts/views/user_sessions/new.js.coffee +++ b/app/assets/javascripts/views/user_sessions/new.js.coffee @@ -1,5 +1,5 @@ # form for user sign in -class Pettanr.Views.UserSeeeion.New extends Backbone.View +class Pettanr.Views.UserSeeeion.New extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/views/users/account.js.coffee b/app/assets/javascripts/views/users/account.js.coffee index e18e054f..b99eec58 100644 --- a/app/assets/javascripts/views/users/account.js.coffee +++ b/app/assets/javascripts/views/users/account.js.coffee @@ -1,5 +1,5 @@ # page header for signed in user -class Pettanr.Views.User.Account extends Backbone.View +class Pettanr.Views.User.Account extends Pettanr.View tagName: 'div' initialize: (options) -> @@ -54,7 +54,7 @@ class Pettanr.Views.User.Account extends Backbone.View @trigger('http_get', url) return false -class Pettanr.Views.User.Account.Quick extends Backbone.View +class Pettanr.Views.User.Account.Quick extends Pettanr.View tagName: 'span' initialize: (options) -> diff --git a/app/assets/javascripts/views/users/guest.js.coffee b/app/assets/javascripts/views/users/guest.js.coffee index 9c58277b..0049fc03 100644 --- a/app/assets/javascripts/views/users/guest.js.coffee +++ b/app/assets/javascripts/views/users/guest.js.coffee @@ -1,5 +1,5 @@ # page header for guest -class Pettanr.Views.User.Guest extends Backbone.View +class Pettanr.Views.User.Guest extends Pettanr.View tagName: 'div' className: 'account' diff --git a/app/assets/javascripts/views/writing_formats/show.js.coffee b/app/assets/javascripts/views/writing_formats/show.js.coffee index 95c6ffd9..955552be 100644 --- a/app/assets/javascripts/views/writing_formats/show.js.coffee +++ b/app/assets/javascripts/views/writing_formats/show.js.coffee @@ -1,4 +1,4 @@ -class Pettanr.Views.WritingFormat.Show extends Backbone.View +class Pettanr.Views.WritingFormat.Show extends Pettanr.View tagName: 'div' initialize: (options) -> diff --git a/app/assets/javascripts/yasapp.js b/app/assets/javascripts/yasapp.js index 194fa94c..6cafcb9b 100644 --- a/app/assets/javascripts/yasapp.js +++ b/app/assets/javascripts/yasapp.js @@ -17,6 +17,9 @@ //= require json2 //= require backbone //= require i18n +//= require ./pettanr +//= require ./routes +//= require ./view //= require ./tags //= require ./manifest_base/manifest_base //= require ./manifest_base/base @@ -279,8 +282,6 @@ //= require ./peta/binder //= require ./peta/leaf //= require ./peta/editize -//= require ./pettanr -//= require ./routes //= require ./controllers //= require ./views //= require ./editor @@ -356,5 +357,6 @@ //= require ./pettanr/proxy //= require ./pettanr/cache //= require ./pettanr/inspire +//= require ./pettanr/tg //= require ./backbone.fetch-cache //= require main -- 2.11.0