From aef339be852b4910225c5c9b8798df77bdbc9a9e Mon Sep 17 00:00:00 2001 From: yasushiito Date: Thu, 9 Apr 2015 18:50:17 +0900 Subject: [PATCH] operator move to cache --- app/assets/javascripts/controllers.js.coffee | 18 ++++------ .../javascripts/controllers/artists.js.coffee | 1 - .../javascripts/controllers/authors.js.coffee | 1 - .../javascripts/controllers/balloons.js.coffee | 1 - .../controllers/comic_stories.js.coffee | 5 ++- .../javascripts/controllers/comics.js.coffee | 6 ++-- .../javascripts/controllers/folders.js.coffee | 1 - .../controllers/ground_colors.js.coffee | 1 - .../controllers/ground_pictures.js.coffee | 1 - app/assets/javascripts/controllers/home.js.coffee | 1 - .../controllers/license_groups.js.coffee | 1 - .../javascripts/controllers/licenses.js.coffee | 1 - .../controllers/original_pictures.js.coffee | 5 ++- .../controllers/panel_pictures.js.coffee | 1 - .../javascripts/controllers/panels.js.coffee | 7 ++-- .../javascripts/controllers/pictures.js.coffee | 1 - .../resource_picture_pictures.js.coffee | 1 - .../controllers/resource_pictures.js.coffee | 1 - .../controllers/scroll_panels.js.coffee | 5 ++- .../javascripts/controllers/scrolls.js.coffee | 6 ++-- .../javascripts/controllers/sheet_panels.js.coffee | 5 ++- .../javascripts/controllers/sheets.js.coffee | 6 ++-- .../controllers/speech_balloon_templates.js.coffee | 1 - .../controllers/speech_balloons.js.coffee | 1 - .../javascripts/controllers/speeches.js.coffee | 1 - .../javascripts/controllers/stories.js.coffee | 6 ++-- .../javascripts/controllers/story_sheets.js.coffee | 5 ++- .../controllers/system_pictures.js.coffee | 1 - app/assets/javascripts/controllers/top.js.coffee | 4 +-- app/assets/javascripts/controllers/users.js.coffee | 4 +-- .../controllers/writing_formats.js.coffee | 1 - .../javascripts/editor/panel_editor.js.coffee | 4 +-- .../editor/panel_editor/dialog.js.coffee | 3 +- .../panel_editor/element/element_board.js.coffee | 2 +- .../javascripts/editor/panel_editor/root.js.coffee | 2 -- .../editor/panel_editor/scenario.js.coffee | 4 --- app/assets/javascripts/locmare/bucket.js.coffee | 12 +------ app/assets/javascripts/locmare/filer.js.coffee | 1 - .../file_body/file_item/edit/account.js.coffee | 2 +- .../file_body/file_item/edit/default.js.coffee | 4 +-- app/assets/javascripts/locmare/form.js.coffee | 6 ---- .../locmare/form/field/tag/select.js.coffee | 4 +-- .../javascripts/locmare/list_group.js.coffee | 6 ++-- .../locmare/list_group/list/base.js.coffee | 1 - app/assets/javascripts/locmare/profiler.js.coffee | 1 - .../profiler/association/belongs_to.js.coffee | 1 - .../profiler/association/has_many.js.coffee | 2 -- .../locmare/profiler/association/has_one.js.coffee | 2 -- .../javascripts/locmare/profiler/header.js.coffee | 1 - app/assets/javascripts/main.js.coffee | 2 +- .../manifest/model/association/has_many.js.coffee | 7 +++- app/assets/javascripts/models/comic.js.coffee | 4 +-- .../javascripts/models/original_picture.js.coffee | 2 +- app/assets/javascripts/models/panel.js.coffee | 8 ++--- app/assets/javascripts/models/picture.js.coffee | 4 +-- .../javascripts/models/resource_picture.js.coffee | 2 +- .../models/resource_picture_picture.js.coffee | 2 +- app/assets/javascripts/models/scroll.js.coffee | 2 +- app/assets/javascripts/models/sheet.js.coffee | 4 +-- app/assets/javascripts/models/story.js.coffee | 4 +-- app/assets/javascripts/peta/content.js.coffee | 4 +-- app/assets/javascripts/peta/item.js.coffee | 2 +- app/assets/javascripts/peta/owner.js.coffee | 2 +- .../javascripts/peta/system_resource.js.coffee | 2 +- app/assets/javascripts/pettanr.js.coffee | 13 ++++++-- .../javascripts/pettanr/action_filter.js.coffee | 12 +++---- app/assets/javascripts/pettanr/cache.js.coffee | 1 + app/assets/javascripts/pettanr/proxy.js.coffee | 9 +++-- .../resource_picture_pictures.js.coffee | 3 -- app/assets/javascripts/routes.js.coffee | 1 - .../javascripts/views/artists/show.js.coffee | 1 - .../javascripts/views/authors/show.js.coffee | 1 - .../javascripts/views/balloons/show.js.coffee | 3 -- app/assets/javascripts/views/comics/play.js.coffee | 13 ++------ app/assets/javascripts/views/comics/show.js.coffee | 6 ++-- .../views/ground_colors/new_element.js.coffee | 1 - .../javascripts/views/ground_colors/show.js.coffee | 3 -- .../views/ground_pictures/show.js.coffee | 3 -- app/assets/javascripts/views/home/show.js.coffee | 1 - app/assets/javascripts/views/layout.js.coffee | 21 +++++------- .../javascripts/views/layouts/blog.js.coffee | 6 ++-- .../views/license_groups/show.js.coffee | 1 - .../javascripts/views/licenses/show.js.coffee | 1 - .../views/original_pictures/publish.js.coffee | 2 +- .../views/original_pictures/show.js.coffee | 1 - .../views/panel_pictures/show.js.coffee | 3 -- app/assets/javascripts/views/panels/body.js.coffee | 7 ++-- app/assets/javascripts/views/panels/show.js.coffee | 5 --- .../javascripts/views/pictures/show.js.coffee | 1 - .../views/resource_picture_pictures/show.js.coffee | 1 - .../views/resource_pictures/show.js.coffee | 1 - .../javascripts/views/scrolls/play.js.coffee | 39 +++++++++++++--------- .../javascripts/views/scrolls/show.js.coffee | 6 ++-- app/assets/javascripts/views/sheets/play.js.coffee | 17 ++-------- app/assets/javascripts/views/sheets/show.js.coffee | 6 ++-- app/assets/javascripts/views/show.js.coffee | 5 +-- .../views/speech_balloon_templates/show.js.coffee | 1 - .../views/speech_balloons/show.js.coffee | 3 -- .../javascripts/views/speeches/show.js.coffee | 3 -- .../javascripts/views/stories/play.js.coffee | 16 ++------- .../javascripts/views/stories/show.js.coffee | 6 ++-- .../views/system_pictures/show.js.coffee | 1 - app/assets/javascripts/views/top/demo.js.coffee | 1 - .../javascripts/views/user_sessions/new.js.coffee | 1 - .../javascripts/views/users/account.js.coffee | 5 ++- .../views/writing_formats/show.js.coffee | 1 - .../stylesheets/resource_picture_pictures.css.scss | 3 -- 107 files changed, 150 insertions(+), 294 deletions(-) delete mode 100644 app/assets/javascripts/resource_picture_pictures.js.coffee delete mode 100644 app/assets/stylesheets/resource_picture_pictures.css.scss diff --git a/app/assets/javascripts/controllers.js.coffee b/app/assets/javascripts/controllers.js.coffee index 395545a3..ca09ce89 100644 --- a/app/assets/javascripts/controllers.js.coffee +++ b/app/assets/javascripts/controllers.js.coffee @@ -1,11 +1,11 @@ class Pettanr.AppController - constructor: (@params, @form, @operators, @gate) -> + constructor: (@params, @form, @gate) -> _.extend(this, Backbone.Events) - @new2: (params, form, operators, gate) -> + @new2: (params, form, gate) -> c = @controller_by_name(params['controller']) - new c(params, form, operators, gate) + new c(params, form, gate) @controller_by_name: (name) -> Pettanr[Pettanr.camelize(name) + 'Controller'] @@ -21,7 +21,7 @@ class Pettanr.AppController @my_list_model = Manifest.manifest().models[@my_action.item_name] @my_list_model_class = @my_list_model.classify() @list = Locmare.ListGroup.list( - @my_action.path_name(), @my_action.name, @operators, @params + @my_action.path_name(), @my_action.name, @params ) set_show: (render_func) -> @@ -37,8 +37,7 @@ class Pettanr.AppController filer = new Locmare.Filer({ item_name: @list.item_name, items: @list.items(), - pager: pager, - operators: @operators + pager: pager }) @listenTo(filer, 'navigate', @navigate) filer.render() @@ -60,9 +59,7 @@ class Pettanr.AppController @item.boosts 'post' profiler = new Locmare.Profiler({ item_name: @item.item_name(), - item: @item, - cache: @cache, - operators: @operators + item: @item }) @listenTo(profiler, 'navigate', @navigate) profiler.render() @@ -92,8 +89,7 @@ class Pettanr.AppController use_name: 'default', item: @item, element_form: false, - submit: 'default', - operators: @operators, + submit: 'default' }) @form.render() @trigger('ready', @form) diff --git a/app/assets/javascripts/controllers/artists.js.coffee b/app/assets/javascripts/controllers/artists.js.coffee index 6b10dfaf..25b031c0 100644 --- a/app/assets/javascripts/controllers/artists.js.coffee +++ b/app/assets/javascripts/controllers/artists.js.coffee @@ -19,7 +19,6 @@ class Pettanr.ArtistsController extends Pettanr.AppController @trigger('title', @params, @item.get('name')) show = new Pettanr.Views.Artist.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/authors.js.coffee b/app/assets/javascripts/controllers/authors.js.coffee index efd89ece..0773e367 100644 --- a/app/assets/javascripts/controllers/authors.js.coffee +++ b/app/assets/javascripts/controllers/authors.js.coffee @@ -19,7 +19,6 @@ class Pettanr.AuthorsController extends Pettanr.AppController @trigger('title', @params, @item.get('name')) show = new Pettanr.Views.Author.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/balloons.js.coffee b/app/assets/javascripts/controllers/balloons.js.coffee index a6837e67..7992a5f9 100644 --- a/app/assets/javascripts/controllers/balloons.js.coffee +++ b/app/assets/javascripts/controllers/balloons.js.coffee @@ -29,7 +29,6 @@ class Pettanr.BalloonsController extends Pettanr.AppController @trigger('title', @params) show = new Pettanr.Views.Balloon.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/comic_stories.js.coffee b/app/assets/javascripts/controllers/comic_stories.js.coffee index 8f4d0349..7e89cd5f 100644 --- a/app/assets/javascripts/controllers/comic_stories.js.coffee +++ b/app/assets/javascripts/controllers/comic_stories.js.coffee @@ -34,7 +34,6 @@ class Pettanr.ComicStoriesController extends Pettanr.AppController @trigger('title', @params) show = new Pettanr.Views.ComicStory.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) @@ -53,13 +52,13 @@ class Pettanr.ComicStoriesController extends Pettanr.AppController @trigger('done', @params) create: () -> - @form.item.overwrite(@operators) + @form.item.overwrite() @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() update: () -> - @form.item.overwrite(@operators) + @form.item.overwrite() @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() diff --git a/app/assets/javascripts/controllers/comics.js.coffee b/app/assets/javascripts/controllers/comics.js.coffee index 9c1bf6be..6f95cdc3 100644 --- a/app/assets/javascripts/controllers/comics.js.coffee +++ b/app/assets/javascripts/controllers/comics.js.coffee @@ -29,7 +29,6 @@ class Pettanr.ComicsController extends Pettanr.AppController @trigger('title', @params, @item.get('title')) show = new Pettanr.Views.Comic.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) @@ -46,7 +45,6 @@ class Pettanr.ComicsController extends Pettanr.AppController show = new Pettanr.Views.Comic.Play({ item: @item, list: @list, - operators: @operators }) show.render() @trigger('ready', show) @@ -66,13 +64,13 @@ class Pettanr.ComicsController extends Pettanr.AppController @trigger('done', @params) create: () -> - @form.item.overwrite({operators: @operators}) + @form.item.overwrite({}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() update: () -> - @form.item.overwrite({operators: @operators}) + @form.item.overwrite({}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() diff --git a/app/assets/javascripts/controllers/folders.js.coffee b/app/assets/javascripts/controllers/folders.js.coffee index 1d7558ef..a47d6dca 100644 --- a/app/assets/javascripts/controllers/folders.js.coffee +++ b/app/assets/javascripts/controllers/folders.js.coffee @@ -47,7 +47,6 @@ class Pettanr.FoldersController extends Pettanr.AppController item_name: 'folder', items: collection.models, pager: null, - operators: @operators }) filer.render() @trigger('ready', filer) diff --git a/app/assets/javascripts/controllers/ground_colors.js.coffee b/app/assets/javascripts/controllers/ground_colors.js.coffee index efd2fe39..883ee9fb 100644 --- a/app/assets/javascripts/controllers/ground_colors.js.coffee +++ b/app/assets/javascripts/controllers/ground_colors.js.coffee @@ -29,7 +29,6 @@ class Pettanr.GroundColorsController extends Pettanr.AppController @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.GroundColor.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/ground_pictures.js.coffee b/app/assets/javascripts/controllers/ground_pictures.js.coffee index 55329319..d3d823ff 100644 --- a/app/assets/javascripts/controllers/ground_pictures.js.coffee +++ b/app/assets/javascripts/controllers/ground_pictures.js.coffee @@ -29,7 +29,6 @@ class Pettanr.GroundPicturesController extends Pettanr.AppController @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.GroundPicture.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/home.js.coffee b/app/assets/javascripts/controllers/home.js.coffee index 91b5e61c..2738a32a 100644 --- a/app/assets/javascripts/controllers/home.js.coffee +++ b/app/assets/javascripts/controllers/home.js.coffee @@ -4,7 +4,6 @@ class Pettanr.HomeController extends Pettanr.AppController view = new Pettanr.Views.Home.Configure({ el: "#pettanr", item: @item, - operators: @operators }) view.render() diff --git a/app/assets/javascripts/controllers/license_groups.js.coffee b/app/assets/javascripts/controllers/license_groups.js.coffee index 92b3f434..9591900e 100644 --- a/app/assets/javascripts/controllers/license_groups.js.coffee +++ b/app/assets/javascripts/controllers/license_groups.js.coffee @@ -19,7 +19,6 @@ class Pettanr.LicenseGroupsController extends Pettanr.AppController @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.LicenseGroup.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/licenses.js.coffee b/app/assets/javascripts/controllers/licenses.js.coffee index 94c5f653..fcb93a3e 100644 --- a/app/assets/javascripts/controllers/licenses.js.coffee +++ b/app/assets/javascripts/controllers/licenses.js.coffee @@ -29,7 +29,6 @@ class Pettanr.LicensesController extends Pettanr.AppController @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.License.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/original_pictures.js.coffee b/app/assets/javascripts/controllers/original_pictures.js.coffee index e2949ffe..23c85766 100644 --- a/app/assets/javascripts/controllers/original_pictures.js.coffee +++ b/app/assets/javascripts/controllers/original_pictures.js.coffee @@ -24,7 +24,6 @@ class Pettanr.OriginalPicturesController extends Pettanr.AppController @trigger('title', @params) show = new Pettanr.Views.OriginalPicture.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) @@ -37,13 +36,13 @@ class Pettanr.OriginalPicturesController extends Pettanr.AppController edit: () -> create: () -> - @form.item.overwrite(@operators) + @form.item.overwrite() @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() update: () -> - @form.item.overwrite(@operators) + @form.item.overwrite() @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() diff --git a/app/assets/javascripts/controllers/panel_pictures.js.coffee b/app/assets/javascripts/controllers/panel_pictures.js.coffee index 4aec23d5..71e82673 100644 --- a/app/assets/javascripts/controllers/panel_pictures.js.coffee +++ b/app/assets/javascripts/controllers/panel_pictures.js.coffee @@ -29,7 +29,6 @@ class Pettanr.PanelPicturesController extends Pettanr.AppController @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.PanelPicture.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/panels.js.coffee b/app/assets/javascripts/controllers/panels.js.coffee index cf61647f..e42875fc 100644 --- a/app/assets/javascripts/controllers/panels.js.coffee +++ b/app/assets/javascripts/controllers/panels.js.coffee @@ -42,7 +42,6 @@ class Pettanr.PanelsController extends Pettanr.AppController @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.Panel.Show({ panel: @item, - operators: @operators, spot: null }) show.render() @@ -68,21 +67,21 @@ class Pettanr.PanelsController extends Pettanr.AppController @trigger('done', @params) editor: () -> - editor = new Editor.PanelEditor({root_item: @item, operators: @operators}) + editor = new Editor.PanelEditor({root_item: @item}) editor.render() @trigger('lock', @params, editor) @trigger('ready', editor) create: () -> # @form is editor - @form.panel.overwrite({operators: @operators}) + @form.panel.overwrite({}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() update: () -> # @form is editor - @form.panel.overwrite({operators: @operators}) + @form.panel.overwrite({}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() diff --git a/app/assets/javascripts/controllers/pictures.js.coffee b/app/assets/javascripts/controllers/pictures.js.coffee index c6f82791..68f969e9 100644 --- a/app/assets/javascripts/controllers/pictures.js.coffee +++ b/app/assets/javascripts/controllers/pictures.js.coffee @@ -24,7 +24,6 @@ class Pettanr.PicturesController extends Pettanr.AppController @trigger('title', @params) show = new Pettanr.Views.Picture.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/resource_picture_pictures.js.coffee b/app/assets/javascripts/controllers/resource_picture_pictures.js.coffee index 76e21b7e..e05eb0e1 100644 --- a/app/assets/javascripts/controllers/resource_picture_pictures.js.coffee +++ b/app/assets/javascripts/controllers/resource_picture_pictures.js.coffee @@ -34,7 +34,6 @@ class Pettanr.ResourcePicturePicturesController extends Pettanr.AppController @trigger('title', @params) show = new Pettanr.Views.ResourcePicturePicture.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/resource_pictures.js.coffee b/app/assets/javascripts/controllers/resource_pictures.js.coffee index 37409bdd..ea015210 100644 --- a/app/assets/javascripts/controllers/resource_pictures.js.coffee +++ b/app/assets/javascripts/controllers/resource_pictures.js.coffee @@ -34,7 +34,6 @@ class Pettanr.ResourcePicturesController extends Pettanr.AppController @trigger('title', @params) show = new Pettanr.Views.ResourcePicture.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/scroll_panels.js.coffee b/app/assets/javascripts/controllers/scroll_panels.js.coffee index c2b1a55f..f39efac2 100644 --- a/app/assets/javascripts/controllers/scroll_panels.js.coffee +++ b/app/assets/javascripts/controllers/scroll_panels.js.coffee @@ -34,7 +34,6 @@ class Pettanr.ScrollPanelsController extends Pettanr.AppController @trigger('title', @params) show = new Pettanr.Views.ScrollPanel.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) @@ -53,13 +52,13 @@ class Pettanr.ScrollPanelsController extends Pettanr.AppController @trigger('done', @params) create: () -> - @form.item.overwrite(@operators) + @form.item.overwrite() @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() update: () -> - @form.item.overwrite(@operators) + @form.item.overwrite() @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() diff --git a/app/assets/javascripts/controllers/scrolls.js.coffee b/app/assets/javascripts/controllers/scrolls.js.coffee index cf65e02c..2d68aa37 100644 --- a/app/assets/javascripts/controllers/scrolls.js.coffee +++ b/app/assets/javascripts/controllers/scrolls.js.coffee @@ -30,7 +30,6 @@ class Pettanr.ScrollsController extends Pettanr.AppController @trigger('title', @params, @item.get('title')) show = new Pettanr.Views.Scroll.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) @@ -45,7 +44,6 @@ class Pettanr.ScrollsController extends Pettanr.AppController show = new Pettanr.Views.Scroll.Play({ item: @item, list: @list, - operators: @operators }) show.render() @trigger('ready', show) @@ -63,13 +61,13 @@ class Pettanr.ScrollsController extends Pettanr.AppController @trigger('done', @params) create: () -> - @form.item.overwrite({operators: @operators}) + @form.item.overwrite({}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() update: () -> - @form.item.overwrite({operators: @operators}) + @form.item.overwrite({}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() diff --git a/app/assets/javascripts/controllers/sheet_panels.js.coffee b/app/assets/javascripts/controllers/sheet_panels.js.coffee index 85ebee76..de1ea606 100644 --- a/app/assets/javascripts/controllers/sheet_panels.js.coffee +++ b/app/assets/javascripts/controllers/sheet_panels.js.coffee @@ -34,7 +34,6 @@ class Pettanr.SheetPanelsController extends Pettanr.AppController @trigger('title', @params) show = new Pettanr.Views.SheetPanel.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) @@ -53,13 +52,13 @@ class Pettanr.SheetPanelsController extends Pettanr.AppController @trigger('done', @params) create: () -> - @form.item.overwrite(@operators) + @form.item.overwrite() @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() update: () -> - @form.item.overwrite(@operators) + @form.item.overwrite() @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() diff --git a/app/assets/javascripts/controllers/sheets.js.coffee b/app/assets/javascripts/controllers/sheets.js.coffee index 23a03c11..8c1e83b9 100644 --- a/app/assets/javascripts/controllers/sheets.js.coffee +++ b/app/assets/javascripts/controllers/sheets.js.coffee @@ -34,7 +34,6 @@ class Pettanr.SheetsController extends Pettanr.AppController @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.Sheet.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) @@ -49,7 +48,6 @@ class Pettanr.SheetsController extends Pettanr.AppController show = new Pettanr.Views.Sheet.Play({ item: @item, list: @list, - operators: @operators }) show.render() @trigger('ready', show) @@ -69,13 +67,13 @@ class Pettanr.SheetsController extends Pettanr.AppController @trigger('done', @params) create: () -> - @form.item.overwrite({operators: @operators}) + @form.item.overwrite({}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() update: () -> - @form.item.overwrite({operators: @operators}) + @form.item.overwrite({}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() diff --git a/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee b/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee index 5a9818bb..fafec5a5 100644 --- a/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee +++ b/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee @@ -29,7 +29,6 @@ class Pettanr.SpeechBalloonTemplatesController extends Pettanr.AppController @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.SpeechBalloonTemplate.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/speech_balloons.js.coffee b/app/assets/javascripts/controllers/speech_balloons.js.coffee index fbbbfeb5..69aab0f5 100644 --- a/app/assets/javascripts/controllers/speech_balloons.js.coffee +++ b/app/assets/javascripts/controllers/speech_balloons.js.coffee @@ -34,7 +34,6 @@ class Pettanr.SpeechBalloonsController extends Pettanr.AppController @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.SpeechBalloon.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/speeches.js.coffee b/app/assets/javascripts/controllers/speeches.js.coffee index df82efdc..8668bd43 100644 --- a/app/assets/javascripts/controllers/speeches.js.coffee +++ b/app/assets/javascripts/controllers/speeches.js.coffee @@ -29,7 +29,6 @@ class Pettanr.SpeechesController extends Pettanr.AppController @trigger('title', @params) show = new Pettanr.Views.Speech.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/stories.js.coffee b/app/assets/javascripts/controllers/stories.js.coffee index 060db43c..0f82e0ad 100644 --- a/app/assets/javascripts/controllers/stories.js.coffee +++ b/app/assets/javascripts/controllers/stories.js.coffee @@ -34,7 +34,6 @@ class Pettanr.StoriesController extends Pettanr.AppController @trigger('title', @params, @item.get('title')) show = new Pettanr.Views.Story.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) @@ -51,7 +50,6 @@ class Pettanr.StoriesController extends Pettanr.AppController show = new Pettanr.Views.Story.Play({ item: @item, list: @list, - operators: @operators }) show.render() @trigger('ready', show) @@ -71,13 +69,13 @@ class Pettanr.StoriesController extends Pettanr.AppController @trigger('done', @params) create: () -> - @form.item.overwrite({operators: @operators}) + @form.item.overwrite({}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() update: () -> - @form.item.overwrite({operators: @operators}) + @form.item.overwrite({}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() diff --git a/app/assets/javascripts/controllers/story_sheets.js.coffee b/app/assets/javascripts/controllers/story_sheets.js.coffee index 3b2ba65d..79e21cd9 100644 --- a/app/assets/javascripts/controllers/story_sheets.js.coffee +++ b/app/assets/javascripts/controllers/story_sheets.js.coffee @@ -34,7 +34,6 @@ class Pettanr.StorySheetsController extends Pettanr.AppController @trigger('title', @params) show = new Pettanr.Views.StorySheet.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) @@ -53,13 +52,13 @@ class Pettanr.StorySheetsController extends Pettanr.AppController @trigger('done', @params) create: () -> - @form.item.overwrite(@operators) + @form.item.overwrite() @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() update: () -> - @form.item.overwrite(@operators) + @form.item.overwrite() @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() diff --git a/app/assets/javascripts/controllers/system_pictures.js.coffee b/app/assets/javascripts/controllers/system_pictures.js.coffee index 4a604c96..181f6e19 100644 --- a/app/assets/javascripts/controllers/system_pictures.js.coffee +++ b/app/assets/javascripts/controllers/system_pictures.js.coffee @@ -19,7 +19,6 @@ class Pettanr.SystemPicturesController extends Pettanr.AppController @trigger('title', @params) show = new Pettanr.Views.SystemPicture.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/controllers/top.js.coffee b/app/assets/javascripts/controllers/top.js.coffee index 4417a5d8..0b86febe 100644 --- a/app/assets/javascripts/controllers/top.js.coffee +++ b/app/assets/javascripts/controllers/top.js.coffee @@ -1,13 +1,13 @@ class Pettanr.TopController extends Pettanr.AppController index: () -> - view = new Pettanr.Views.Top.Index({operators: @operators}) + view = new Pettanr.Views.Top.Index({}) view.render() @trigger('ready', view) # use in case guest landing for blog mode demo: () -> - view = new Pettanr.Views.Top.Demo({operators: @operators}) + view = new Pettanr.Views.Top.Demo({}) view.render() @trigger('ready', view) diff --git a/app/assets/javascripts/controllers/users.js.coffee b/app/assets/javascripts/controllers/users.js.coffee index 5f288d1f..154fc609 100644 --- a/app/assets/javascripts/controllers/users.js.coffee +++ b/app/assets/javascripts/controllers/users.js.coffee @@ -21,13 +21,13 @@ class Pettanr.UsersController extends Pettanr.AppController # header for guest guest: () -> - view = new Pettanr.Views.User.Guest({operators: @operators}) + view = new Pettanr.Views.User.Guest({}) view.render() @trigger('ready', view) # header for signed in user account: () -> - view = new Pettanr.Views.User.Account({operators: @operators}) + view = new Pettanr.Views.User.Account({}) view.render() @trigger('ready', view) diff --git a/app/assets/javascripts/controllers/writing_formats.js.coffee b/app/assets/javascripts/controllers/writing_formats.js.coffee index 17b1297a..8c52bef2 100644 --- a/app/assets/javascripts/controllers/writing_formats.js.coffee +++ b/app/assets/javascripts/controllers/writing_formats.js.coffee @@ -24,7 +24,6 @@ class Pettanr.WritingFormatsController extends Pettanr.AppController @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.WritingFormat.Show({ item: @item, - operators: @operators }) show.render() @trigger('ready', show) diff --git a/app/assets/javascripts/editor/panel_editor.js.coffee b/app/assets/javascripts/editor/panel_editor.js.coffee index a174104b..35de92a5 100644 --- a/app/assets/javascripts/editor/panel_editor.js.coffee +++ b/app/assets/javascripts/editor/panel_editor.js.coffee @@ -4,14 +4,12 @@ class Editor.PanelEditor extends Backbone.View initialize: (options) -> @panel = options.root_item - @operators = options.operators @item = @panel @dialog = new Editor.PanelEditor.Dialog({ - parent: this, operators: @operators + parent: this }) @body = new Pettanr.Views.Panel.Body.Edit({ panel: @root_item(), - operators: @operators, spot: null }) @dock = new Editor.PanelEditor.Dock({parent: this}) diff --git a/app/assets/javascripts/editor/panel_editor/dialog.js.coffee b/app/assets/javascripts/editor/panel_editor/dialog.js.coffee index a46d0eb5..2c2dea84 100644 --- a/app/assets/javascripts/editor/panel_editor/dialog.js.coffee +++ b/app/assets/javascripts/editor/panel_editor/dialog.js.coffee @@ -4,7 +4,6 @@ class Editor.PanelEditor.Dialog extends Backbone.View initialize: (options) -> @parent = options.parent - @operators = options.operators @target_model = options.target_model @history = new Pettanr.Views.History({parent: this}) @listenTo(@history, 'http_get', @http_get) @@ -28,7 +27,7 @@ class Editor.PanelEditor.Dialog extends Backbone.View this.$el.append(view.el) getter_proxy: () -> - proxy = new Pettanr.PickerProxy({operators: @operators}) + proxy = new Pettanr.PickerProxy({}) @listenTo(proxy, 'ready', @ready) @listenTo(proxy, 'title', @title) @listenTo(proxy, 'title', @push_history) diff --git a/app/assets/javascripts/editor/panel_editor/element/element_board.js.coffee b/app/assets/javascripts/editor/panel_editor/element/element_board.js.coffee index 037e22f0..eaf9b1b0 100644 --- a/app/assets/javascripts/editor/panel_editor/element/element_board.js.coffee +++ b/app/assets/javascripts/editor/panel_editor/element/element_board.js.coffee @@ -35,7 +35,7 @@ class Editor.EditorModule.DockModule.TabModule.ElementBoardBody extends Editor.E item: @element(), element_form: true, submit: null, - operators: @dock().editor().operators, + operators: Pettanr.cache.operators, }) render: () -> diff --git a/app/assets/javascripts/editor/panel_editor/root.js.coffee b/app/assets/javascripts/editor/panel_editor/root.js.coffee index c7b7a9a6..83c312b5 100644 --- a/app/assets/javascripts/editor/panel_editor/root.js.coffee +++ b/app/assets/javascripts/editor/panel_editor/root.js.coffee @@ -16,9 +16,7 @@ class Editor.EditorModule.DockModule.TabModule.RootBayBody extends Editor.Editor form_name: @root_item().item_name(), use_name: 'default' item: @root_item(), - mounted: @mounted(), submit: 'default' - operators: @dock().editor().operators, action: '/' + @root_item().table_name() + '/' + Pettanr.to_s(@root_item().get('id')) }) @listenTo(@form, 'http_post', @http_post) diff --git a/app/assets/javascripts/editor/panel_editor/scenario.js.coffee b/app/assets/javascripts/editor/panel_editor/scenario.js.coffee index c966f24f..2ab86ea6 100644 --- a/app/assets/javascripts/editor/panel_editor/scenario.js.coffee +++ b/app/assets/javascripts/editor/panel_editor/scenario.js.coffee @@ -187,7 +187,6 @@ class Editor.EditorModule.DockModule.ScenarioBay.ElementBody extends Backbone.Vi item: @element(), element_form: true, submit: null, - operators: @dock().editor().operators, }) render: () -> @@ -231,7 +230,4 @@ class Editor.EditorModule.DockModule.TabModule.NewBoardBody extends Editor.Edito initialize: (options) -> super(options) -# form_manager = Pettanr::Application::manifest.form_managers[self.root_item.form_name] -# form = form_manager.open self.root_item, @dock_body.dock.editor.operators, mounted -# bucket = Bucket.new self,form diff --git a/app/assets/javascripts/locmare/bucket.js.coffee b/app/assets/javascripts/locmare/bucket.js.coffee index 5d80c166..0c4b3e93 100644 --- a/app/assets/javascripts/locmare/bucket.js.coffee +++ b/app/assets/javascripts/locmare/bucket.js.coffee @@ -1,16 +1,14 @@ class Locmare.Bucket extends Backbone.View tagName: 'form' - @factory: (bucket_or_form_name, use_name, item, mounted, submit, operators) -> + @factory: (bucket_or_form_name, use_name, item, submit) -> bucket = LocalManifest.manifest().buckets[bucket_or_form_name] if bucket and bucket.has_member() new Locmare.Bucket({ bucket_name: bucket_or_form_name, use_name: use_name, item: item, - mounted: mounted, submit: submit, - operators: operators, action: '/' + item.table_name() + '/' + Pettanr.to_s(item.get('id')) }) else @@ -18,9 +16,7 @@ class Locmare.Bucket extends Backbone.View form_name: bucket_or_form_name, use_name: use_name, item: item, - mounted: mounted, submit: submit, - operators: operators, action: '/' + item.table_name() + '/' + Pettanr.to_s(item.get('id')) }) @@ -28,9 +24,7 @@ class Locmare.Bucket extends Backbone.View @bucket_name = options.bucket_name @use_name = options.use_name @item = options.item - @mounted = options.mounted @submit = options.submit - @operators = options.operators @item.boosts 'post' @manifest = LocalManifest.manifest().buckets[@bucket_name] @@ -40,9 +34,7 @@ class Locmare.Bucket extends Backbone.View form_name: @item.item_name(), use_name: @use_name, item: @item, - mounted: @mounted, submit: false, - operators: @operators }) @init_forms(@item.item_name(), @manifest, @item) @init_fields() @@ -75,9 +67,7 @@ class Locmare.Bucket extends Backbone.View @forms[new_key] = new Locmare.Form({ form_name: new_key, item: member_item, - mounted: @mounted, submit: false, - operators: @operators }) @init_forms(new_key, member_manifest, member_item) diff --git a/app/assets/javascripts/locmare/filer.js.coffee b/app/assets/javascripts/locmare/filer.js.coffee index 5c063609..16c7b834 100644 --- a/app/assets/javascripts/locmare/filer.js.coffee +++ b/app/assets/javascripts/locmare/filer.js.coffee @@ -6,7 +6,6 @@ class Locmare.Filer extends Backbone.View @item_name = options.item_name @items = options.items @pager = options.pager - @operators = options.operators @manifest = LocalManifest.manifest().filers[@item_name] @header = new (@module().Header)({'filer': this}) @body = new (@module().Body)({'filer': this}) diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/account.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/account.js.coffee index 492becaf..f952d441 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/account.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/account.js.coffee @@ -19,7 +19,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.EditItemColum this is_own: () -> - if @item.is_own(@filer().operators) + if @item.is_own(Pettanr.cache.operators) true else false diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/default.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/default.js.coffee index f34bf97b..3ef14748 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/default.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/default.js.coffee @@ -29,7 +29,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.EditItemColum this is_own: () -> - if @item.is_own(@filer().operators) + if @item.is_own(Pettanr.cache.operators) true else false @@ -45,7 +45,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.EditItemColum click_remove: () -> return if !confirm('remove?') - proxy = new Pettanr.Proxy({operators: @filer().operators}) + proxy = new Pettanr.Proxy({}) @listenTo(proxy, 'success', @remove_success) @listenTo(proxy, 'fail', @remove_fail) @listenTo(proxy, 'deny', @remove_deny) diff --git a/app/assets/javascripts/locmare/form.js.coffee b/app/assets/javascripts/locmare/form.js.coffee index f0292ab5..7a01c1c1 100644 --- a/app/assets/javascripts/locmare/form.js.coffee +++ b/app/assets/javascripts/locmare/form.js.coffee @@ -1,8 +1,6 @@ # form_name_with_sub_form # item: editing item -# mounted: true/false # submit: string / 'submit' -# operators: class Locmare.FormBase extends Backbone.View tagName: 'form' @@ -12,7 +10,6 @@ class Locmare.FormBase extends Backbone.View @item = options.item @element_form = options.element_form @submit = options.submit - @operators = options.operators if /\./.test(@form_name) @sub_form_names = @form_name.split('.') @form_name = @sub_form_names.pop() @@ -115,7 +112,6 @@ class Locmare.Form extends Locmare.FormBase item: element, element_form: @element_form, submit: null, - operators: @operators, }) this.$el.append(form.render().el) mm = @item.my_class().my_manifest() @@ -143,8 +139,6 @@ class Locmare.Form extends Locmare.FormBase form_name: extend_form_name, use_name: @use_name, item: extend_item, - mounted: @mounted, - operators: @operators, field_name: field_name }) else diff --git a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee index ccf65837..57e000ee 100644 --- a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee +++ b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee @@ -58,9 +58,7 @@ class Locmare.FormModule.FieldModule.TagModule.SelectTag extends Locmare.FormMod {id: filter_id} else {} - list = Locmare.ListGroup.list( - resource_controller_name, resource_action_name, - @form().operators, {}) + list = Locmare.ListGroup.list(resource_controller_name, resource_action_name, {}) list.open((page_status) -> members = _.map list.models, (member) -> [member.get(caption_name), member.get('id')] diff --git a/app/assets/javascripts/locmare/list_group.js.coffee b/app/assets/javascripts/locmare/list_group.js.coffee index c81199a1..0c395248 100644 --- a/app/assets/javascripts/locmare/list_group.js.coffee +++ b/app/assets/javascripts/locmare/list_group.js.coffee @@ -10,18 +10,18 @@ class Locmare.ListGroup play: Locmare.ListGroupModule.PlayList } - @list: (controller_name, action_name, operators, options = {}) -> + @list: (controller_name, action_name, options = {}) -> controller_manifest = Manifest.manifest().controllers[controller_name] action_manifest = controller_manifest.actions[action_name] if action_manifest.alias options['order'] ||= action_manifest.order options['direction'] ||= action_manifest.direction alias_action = action_manifest.alias_action - Locmare.ListGroup.list(alias_action.path_name(), alias_action.name, operators, options) + Locmare.ListGroup.list(alias_action.path_name(), alias_action.name, options) else list_group_manifest = LocalManifest.manifest().list_groups[controller_name] list_manifest = list_group_manifest.lists[action_name] c = Locmare.ListGroup.types()[list_manifest.type] - new c({list_group_name: controller_name, list_name: action_name, operators: operators, options: options}) + new c({list_group_name: controller_name, list_name: action_name, options: options}) class Locmare.ListGroupModule diff --git a/app/assets/javascripts/locmare/list_group/list/base.js.coffee b/app/assets/javascripts/locmare/list_group/list/base.js.coffee index 62fe7523..946f9821 100644 --- a/app/assets/javascripts/locmare/list_group/list/base.js.coffee +++ b/app/assets/javascripts/locmare/list_group/list/base.js.coffee @@ -3,7 +3,6 @@ class Locmare.ListGroupModule.Base extends Backbone.Collection initialize: (options) -> @list_group_name = options.list_group_name @list_name = options.list_name - @operators = options.operators @params = options.options @list_group_manifest = LocalManifest.manifest().list_groups[@list_group_name] diff --git a/app/assets/javascripts/locmare/profiler.js.coffee b/app/assets/javascripts/locmare/profiler.js.coffee index bbcd45e1..7e7f9484 100644 --- a/app/assets/javascripts/locmare/profiler.js.coffee +++ b/app/assets/javascripts/locmare/profiler.js.coffee @@ -6,7 +6,6 @@ class Locmare.Profiler extends Backbone.View @item_name = options.item_name @item = options.item # feasible show parsed extend data - @operators = options.operators @profiler_manifest = LocalManifest.manifest().profilers[@item_name] @header = new Locmare.ProfilerModule.Header({profiler: this}) 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 2ca6d743..c53667a4 100644 --- a/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee +++ b/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee @@ -26,7 +26,6 @@ class Locmare.ProfilerModule.AssociationModule.BelongsTo extends Backbone.View item_name: @parent_model().item_name(), items: [@item], pager: null, - operators: @profiler().operators }) @filer.render() @listenTo(@filer, 'http_get', @http_get) 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 53e997b1..71da2824 100644 --- a/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee +++ b/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee @@ -9,7 +9,6 @@ class Locmare.ProfilerModule.AssociationModule.HasMany extends Backbone.View action = controller.actions[@has_many_manifest.action_name] @list = Locmare.ListGroup.list( action.path_name(), action.name, - @profiler().operators, {id: @item().get('id'), page: 1, page_size: 3} ) @list.open((page_status) => @@ -30,7 +29,6 @@ class Locmare.ProfilerModule.AssociationModule.HasMany extends Backbone.View item_name: @has_many_model().item_name(), items: @list.items(), pager: @pager, - operators: @profiler().operators }) @filer.render() @listenTo(@filer, 'http_get', @http_get) 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 da4f1502..02562614 100644 --- a/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee +++ b/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee @@ -9,7 +9,6 @@ class Locmare.ProfilerModule.AssociationModule.HasOne extends Backbone.View action = controller.actions[@has_one_manifest.action_name] @list = Locmare.ListGroup.list( action.path_name(), action.name, - @profiler().operators, {id: @item().get('id')} ) @list.open((page_status) => @@ -31,7 +30,6 @@ class Locmare.ProfilerModule.AssociationModule.HasOne extends Backbone.View item_name: @has_one_model().item_name(), items: @list.items(), pager: @pager, - operators: @profiler().operators }) @filer.render() @listenTo(@filer, 'http_get', @http_get) diff --git a/app/assets/javascripts/locmare/profiler/header.js.coffee b/app/assets/javascripts/locmare/profiler/header.js.coffee index 4db8f0a2..4e4d4f4c 100644 --- a/app/assets/javascripts/locmare/profiler/header.js.coffee +++ b/app/assets/javascripts/locmare/profiler/header.js.coffee @@ -15,7 +15,6 @@ class Locmare.ProfilerModule.Header extends Backbone.View item_name: @profiler.item_name, items: [@profiler.item], pager: @pager, - operators: @profiler.operators }) @filer.render() @listenTo(@filer, 'http_get', @http_get) diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index 62888c24..fda39bbf 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -28,7 +28,7 @@ $ -> return('leave?') Backbone.history.start({silent: true, pushState: true, root: '/'}) - Pettanr.cache = new Pettanr.Cache() + Pettanr.cache = new Pettanr.Cache({operators: new Pettanr.Operator({})}) layout = if Pettanr.is_sns() new Pettanr.Views.Layout.Sns() else diff --git a/app/assets/javascripts/manifest/model/association/has_many.js.coffee b/app/assets/javascripts/manifest/model/association/has_many.js.coffee index 34cce84b..5040a372 100644 --- a/app/assets/javascripts/manifest/model/association/has_many.js.coffee +++ b/app/assets/javascripts/manifest/model/association/has_many.js.coffee @@ -4,15 +4,20 @@ class Manifest.ModelModule.AssociationModule.HasMany extends ManifestBase.NameVa super() @values['item_name'] ||= Manifest.manifest().singularize(@name) @values['foreign_key'] ||= @parent.item_name() + '_id' + @values['list_action_name'] ||= 'by_' + @parent.item_name() init: () -> super() @item_name = @values['item_name'] @foreign_key = @values['foreign_key'] @through = @values['through'] + @list_action_name = @values['list_action_name'] is_through: () -> - !@through + if @through + true + else + false model: () -> Manifest.item_name_to_model(@item_name) diff --git a/app/assets/javascripts/models/comic.js.coffee b/app/assets/javascripts/models/comic.js.coffee index 98973a0c..beb41f2e 100644 --- a/app/assets/javascripts/models/comic.js.coffee +++ b/app/assets/javascripts/models/comic.js.coffee @@ -16,7 +16,7 @@ class Pettanr.Comic extends Peta.Binder author: () -> new Pettanr.Cache.Retriever(Pettanr.Author, @get('author_id')) - is_visible: (operators) -> + is_visible: (operators = Pettanr.cache.operators) -> switch super(operators) when null return true @@ -26,7 +26,7 @@ class Pettanr.Comic extends Peta.Binder @get('visible') > 0 overwrite: (options) -> - operators = options.operators + operators = Pettanr.cache.operators return false if not operators.author @set('author_id', operators.author.id) diff --git a/app/assets/javascripts/models/original_picture.js.coffee b/app/assets/javascripts/models/original_picture.js.coffee index e2283311..94fa6627 100644 --- a/app/assets/javascripts/models/original_picture.js.coffee +++ b/app/assets/javascripts/models/original_picture.js.coffee @@ -15,7 +15,7 @@ class Pettanr.OriginalPicture extends Peta.Content picture: () -> new Pettanr.Cache.Retriever(Pettanr.Picture, @get('picture_id')) - is_visible: (operators) -> + is_visible: (operators = Pettanr.cache.operators) -> @is_own(operators) filename: () -> diff --git a/app/assets/javascripts/models/panel.js.coffee b/app/assets/javascripts/models/panel.js.coffee index d652d924..2ece658b 100644 --- a/app/assets/javascripts/models/panel.js.coffee +++ b/app/assets/javascripts/models/panel.js.coffee @@ -22,11 +22,11 @@ class Pettanr.Panel extends Peta.Root new Pettanr.Panel.WithElements({id: @get('id')}) overwrite: (options) -> - operators = options.operators + operators = Pettanr.cache.operators return false if not operators.author @set('author_id', operators.author.id) - is_visible: (operators) -> + is_visible: (operators = Pettanr.cache.operators) -> switch super(operators) when null # super return return true @@ -37,9 +37,9 @@ class Pettanr.Panel extends Peta.Root @is_publish() overwrite: (options) -> - @set('author_id', options.operators.author.id) + @set('author_id', Pettanr.cache.operators.author.id) - is_usable: (operators) -> + is_usable: (operators = Pettanr.cache.operators) -> @is_visible(operators) is_publish: () -> diff --git a/app/assets/javascripts/models/picture.js.coffee b/app/assets/javascripts/models/picture.js.coffee index 9bc47c28..46e3598c 100644 --- a/app/assets/javascripts/models/picture.js.coffee +++ b/app/assets/javascripts/models/picture.js.coffee @@ -11,7 +11,7 @@ class Pettanr.Picture extends Peta.Content id: null } - is_visible: (operators) -> + is_visible: (operators = Pettanr.cache.operators) -> return true filename: () -> @@ -73,7 +73,7 @@ class Pettanr.Picture extends Peta.Content else ['', 'v', 'h', 'vh'] - is_showable: (operators = null) -> + is_showable: (operators = Pettanr.cache.operators) -> return false if not @original_picture() return true if @is_own(operators) #@is_enable() and @is_head() diff --git a/app/assets/javascripts/models/resource_picture.js.coffee b/app/assets/javascripts/models/resource_picture.js.coffee index b004967a..eb13aefa 100644 --- a/app/assets/javascripts/models/resource_picture.js.coffee +++ b/app/assets/javascripts/models/resource_picture.js.coffee @@ -14,7 +14,7 @@ class Pettanr.ResourcePicture extends Peta.Content picture: () -> new Pettanr.Cache.Retriever(Pettanr.Picture, @get('picture_id')) - is_visible: (operators) -> + is_visible: (operators = Pettanr.cache.operators) -> @is_user_visible(operators) filename: () -> diff --git a/app/assets/javascripts/models/resource_picture_picture.js.coffee b/app/assets/javascripts/models/resource_picture_picture.js.coffee index 02a83a0c..c04c9a4c 100644 --- a/app/assets/javascripts/models/resource_picture_picture.js.coffee +++ b/app/assets/javascripts/models/resource_picture_picture.js.coffee @@ -14,7 +14,7 @@ class Pettanr.ResourcePicturePicture extends Peta.Item picture: () -> new Pettanr.Picture({id: @get('picture_id')}) - is_visible: (operators) -> + is_visible: (operators = Pettanr.cache.operators) -> true symbol_option: () -> diff --git a/app/assets/javascripts/models/scroll.js.coffee b/app/assets/javascripts/models/scroll.js.coffee index 6744e039..2bfb905c 100644 --- a/app/assets/javascripts/models/scroll.js.coffee +++ b/app/assets/javascripts/models/scroll.js.coffee @@ -16,7 +16,7 @@ class Pettanr.Scroll extends Peta.Binder new Pettanr.Cache.Retriever(Pettanr.Author, @get('author_id')) overwrite: (options) -> - operators = options.operators + operators = Pettanr.cache.operators return false if not operators.author @set('author_id', operators.author.id) diff --git a/app/assets/javascripts/models/sheet.js.coffee b/app/assets/javascripts/models/sheet.js.coffee index 094db452..240d5d3d 100644 --- a/app/assets/javascripts/models/sheet.js.coffee +++ b/app/assets/javascripts/models/sheet.js.coffee @@ -17,11 +17,11 @@ class Pettanr.Sheet extends Peta.Root new Pettanr.Cache.Retriever(Pettanr.Author, @get('author_id')) overwrite: (options) -> - operators = options.operators + operators = Pettanr.cache.operators return false if not operators.author @set('author_id', operators.author.id) - is_visible: (operators) -> + is_visible: (operators = Pettanr.cache.operators) -> switch super(operators) when null return true diff --git a/app/assets/javascripts/models/story.js.coffee b/app/assets/javascripts/models/story.js.coffee index ba4f06c5..dc17136e 100644 --- a/app/assets/javascripts/models/story.js.coffee +++ b/app/assets/javascripts/models/story.js.coffee @@ -17,11 +17,11 @@ class Pettanr.Story extends Peta.Binder new Pettanr.Cache.Retriever(Pettanr.Author, @get('author_id')) overwrite: (options) -> - operators = options.operators + operators = Pettanr.cache.operators return false if not operators.author @set('author_id', operators.author.id) - is_visible: (operators) -> + is_visible: (operators = Pettanr.cache.operators) -> switch super(operators) when null return true diff --git a/app/assets/javascripts/peta/content.js.coffee b/app/assets/javascripts/peta/content.js.coffee index 54133e40..e3f95dd8 100644 --- a/app/assets/javascripts/peta/content.js.coffee +++ b/app/assets/javascripts/peta/content.js.coffee @@ -31,12 +31,12 @@ class Peta.Content extends Peta.Item this # super return if my item - is_visible: (operators) -> + is_visible: (operators = Pettanr.cache.operators) -> super(operators) return null if @owner_model().is_own(operators) true - is_own: (operators) -> + is_own: (operators = Pettanr.cache.operators) -> operator = @my_class().operator(operators) return false if not operator @owner_model().get(@my_class().owner_column()) == operator.id diff --git a/app/assets/javascripts/peta/item.js.coffee b/app/assets/javascripts/peta/item.js.coffee index 7292286f..3bd24460 100644 --- a/app/assets/javascripts/peta/item.js.coffee +++ b/app/assets/javascripts/peta/item.js.coffee @@ -123,7 +123,7 @@ class Peta.Item extends Backbone.Model is_extend_column: (column_name) -> @is_extend_column column_name - is_visible: (operators) -> + is_visible: (operators = Pettanr.cache.operators) -> if Manifest.manifest().magic_numbers['run_mode'] == 0 return false if not operators.is_guest() else diff --git a/app/assets/javascripts/peta/owner.js.coffee b/app/assets/javascripts/peta/owner.js.coffee index 9cbf98da..0d10144c 100644 --- a/app/assets/javascripts/peta/owner.js.coffee +++ b/app/assets/javascripts/peta/owner.js.coffee @@ -1,6 +1,6 @@ class Peta.Owner extends Peta.Item - is_own: (operators) -> + is_own: (operators = Pettanr.cache.operators) -> return false if not operators.user @get('user_id') == operators.user.get('id') diff --git a/app/assets/javascripts/peta/system_resource.js.coffee b/app/assets/javascripts/peta/system_resource.js.coffee index cf9c3c23..98fbd26a 100644 --- a/app/assets/javascripts/peta/system_resource.js.coffee +++ b/app/assets/javascripts/peta/system_resource.js.coffee @@ -1,5 +1,5 @@ class Peta.SystemResource extends Peta.Item - is_own: (operators) -> + is_own: (operators = Pettanr.cache.operators) -> operators.is_admin() diff --git a/app/assets/javascripts/pettanr.js.coffee b/app/assets/javascripts/pettanr.js.coffee index 544c2502..4fffea8c 100644 --- a/app/assets/javascripts/pettanr.js.coffee +++ b/app/assets/javascripts/pettanr.js.coffee @@ -110,8 +110,17 @@ class Pettanr else $.timeago(datetime) - - @cache = null # set by main + @define_associations: () -> + _.each Manifest.manifest().models, (model_manifest, model_name) => + model = model_manifest.classify() + _.each model_manifest.associations.has_many, (has_many_manifest, has_many_name) => + action_name = has_many_manifest.list_action_name + model[has_many_name] = () => + Locmare.ListGroup.list( + model.path_name(), action_name, {id: @get('id')} + ) + + @cache = null @credits = {} #>> https://gist.github.com/davidjbeveridge/3813724 diff --git a/app/assets/javascripts/pettanr/action_filter.js.coffee b/app/assets/javascripts/pettanr/action_filter.js.coffee index 23b3c0f2..47a4da7d 100644 --- a/app/assets/javascripts/pettanr/action_filter.js.coffee +++ b/app/assets/javascripts/pettanr/action_filter.js.coffee @@ -3,10 +3,10 @@ class Pettanr.ActionFilter # access block # return sign in form if invalid url # return null if url is valid - @test: (params, operators) -> - return @guest_url() if @is_deny('reader', params, operators) or @is_deny('resource_reader', params, operators) or @is_deny('user', params, operators) - return @new_author_url() if @is_deny('author', params, operators) - return @new_artist_url() if @is_deny('artist', params, operators) + @test: (params) -> + return @guest_url() if @is_deny('reader', params) or @is_deny('resource_reader', params) or @is_deny('user', params) + return @new_author_url() if @is_deny('author', params) + return @new_artist_url() if @is_deny('artist', params) null @filters: () -> @@ -26,9 +26,9 @@ class Pettanr.ActionFilter # return false if allow # return true if deny - @is_deny: (role, params, operators) -> + @is_deny: (role, params) -> n = 'is_' + role - if not operators[n]() # ex: operators.is_user() + if not Pettanr.cache.operators[n]() # ex: operators.is_user() filter = @my_filters(role, params) if @before_filter(params['action'], filter) return true diff --git a/app/assets/javascripts/pettanr/cache.js.coffee b/app/assets/javascripts/pettanr/cache.js.coffee index 820b19f5..03a4ab9a 100644 --- a/app/assets/javascripts/pettanr/cache.js.coffee +++ b/app/assets/javascripts/pettanr/cache.js.coffee @@ -1,6 +1,7 @@ class Pettanr.Cache constructor: (options) -> + @operators = options.operators @data = {} _.extend(this, Backbone.Events) diff --git a/app/assets/javascripts/pettanr/proxy.js.coffee b/app/assets/javascripts/pettanr/proxy.js.coffee index f9f03bd9..be6b6ae0 100644 --- a/app/assets/javascripts/pettanr/proxy.js.coffee +++ b/app/assets/javascripts/pettanr/proxy.js.coffee @@ -1,12 +1,11 @@ class Pettanr.Proxy constructor: (options) -> - @operators = options.operators @gate = options.gate _.extend(this, Backbone.Events) local_router: (parsed_callback) -> - local_router = new Pettanr.LocalRouter({operators: @operators}) + local_router = new Pettanr.LocalRouter({}) @listenTo(local_router, 'go', parsed_callback) local_router @@ -16,7 +15,7 @@ class Pettanr.Proxy get: (params, form) -> return if !@test(params, form) return if !@filter(params, form) - controller = Pettanr.AppController.new2(params, form, @operators, @gate) + controller = Pettanr.AppController.new2(params, form, @gate) @listenTo(controller, 'ready', @ready) @listenTo(controller, 'title', @title) @listenTo(controller, 'done', @done) @@ -45,7 +44,7 @@ class Pettanr.Proxy false filter: (params, form) -> - if safe_url = Pettanr.ActionFilter.test(params, @operators) + if safe_url = Pettanr.ActionFilter.test(params) @trigger('deny', params, form, safe_url) false else @@ -79,7 +78,7 @@ class Pettanr.Proxy @local_router(@post).navigate(url, form) post: (params, form) -> - controller = Pettanr.AppController.new2(params, form, @operators) + controller = Pettanr.AppController.new2(params, form) @listenTo(controller, 'success', @success) @listenTo(controller, 'fail', @fail) @listenTo(controller, 'redirect', @redirect) diff --git a/app/assets/javascripts/resource_picture_pictures.js.coffee b/app/assets/javascripts/resource_picture_pictures.js.coffee deleted file mode 100644 index 76156794..00000000 --- a/app/assets/javascripts/resource_picture_pictures.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/javascripts/routes.js.coffee b/app/assets/javascripts/routes.js.coffee index be17bf30..0267b639 100644 --- a/app/assets/javascripts/routes.js.coffee +++ b/app/assets/javascripts/routes.js.coffee @@ -32,7 +32,6 @@ class Pettanr.Router extends Backbone.Router initialize: (options) -> super() _.extend(this, Backbone.Events) - @operators = options.operators parse_query_string: (query_string) -> params = {} diff --git a/app/assets/javascripts/views/artists/show.js.coffee b/app/assets/javascripts/views/artists/show.js.coffee index 773eafb3..f0f2b74c 100644 --- a/app/assets/javascripts/views/artists/show.js.coffee +++ b/app/assets/javascripts/views/artists/show.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.Artist.Show extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/authors/show.js.coffee b/app/assets/javascripts/views/authors/show.js.coffee index c515cb12..160b975c 100644 --- a/app/assets/javascripts/views/authors/show.js.coffee +++ b/app/assets/javascripts/views/authors/show.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.Author.Show extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/balloons/show.js.coffee b/app/assets/javascripts/views/balloons/show.js.coffee index c5d91de9..0c386348 100644 --- a/app/assets/javascripts/views/balloons/show.js.coffee +++ b/app/assets/javascripts/views/balloons/show.js.coffee @@ -10,13 +10,11 @@ class Pettanr.Views.Balloon.Show extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = icon_url prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.Balloon.ShowModule.Header({ item: @item, - operators: @operators, caption: '', icon_url: icon_url, caption_url: caption_url, @@ -36,7 +34,6 @@ class Pettanr.Views.Balloon.Show extends Backbone.View @author = new Pettanr.Views.Show.HeaderAuthor({item: @panel}) @body = new Pettanr.Views.Panel.Body({ panel: @panel, - operators: @operators, spot: @item }) @credits = new Pettanr.Views.Panel.ShowModule.Credits({ diff --git a/app/assets/javascripts/views/comics/play.js.coffee b/app/assets/javascripts/views/comics/play.js.coffee index 48257703..c4d76812 100644 --- a/app/assets/javascripts/views/comics/play.js.coffee +++ b/app/assets/javascripts/views/comics/play.js.coffee @@ -16,7 +16,6 @@ class Pettanr.Views.Comic.PlayModule.Footer extends Backbone.View initialize: (options) -> @panel = options.panel @scroll_panel = options.scroll_panel - @operators = options.operators render: () -> this.$el.html('') @@ -36,7 +35,7 @@ class Pettanr.Views.Comic.PlayModule.Footer extends Backbone.View ) this.$el.append(Pettanr.AppHelper.distance_of_time_in_words_to_now(@scroll_panel.get('updated_at'))) # - if @panel.is_own(@operators) + if @panel.is_own() this.$el.append('') this @@ -64,7 +63,6 @@ class Pettanr.Views.Comic.PlayModule.Stories extends Backbone.View initialize: (options) -> @parent = options.parent @items = options.items - @operators = options.operators render: () -> this.$el.html('') @@ -82,7 +80,6 @@ class Pettanr.Views.Comic.PlayModule.Body extends Backbone.View initialize: (options) -> @parent = options.parent @list = options.list - @operators = options.operators @items = @list.items() if @items.length < 1 @render_empty() @@ -99,7 +96,6 @@ class Pettanr.Views.Comic.PlayModule.Body extends Backbone.View panels = new Pettanr.Views.Comic.PlayModule.Stories({ parent: this, items: @items, - operators: @operators }) this.$el.append(panels.render().el) this @@ -111,13 +107,11 @@ class Pettanr.Views.Comic.Play extends Backbone.View initialize: (options) -> @item = options.item @list = options.list - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = Pettanr.url(@item.table_name(), 'play', {id: @item.get('id')}) prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.Comic.PlayModule.Header({ item: @item, - operators: @operators, caption: @item.get('title'), icon_url: icon_url, caption_url: caption_url, @@ -127,15 +121,14 @@ class Pettanr.Views.Comic.Play extends Backbone.View @body = new Pettanr.Views.Comic.PlayModule.Body({ parent: this, list: @list, - operators: @operators }) - @owner = new Pettanr.Views.Comic.PlayModule.Owner({item: @item, operators: @operators}) + @owner = new Pettanr.Views.Comic.PlayModule.Owner({item: @item}) render: () -> this.$el.html('') this.$el.append(@header.render().el) this.$el.append(@author.render().el) this.$el.append(@body.render().el) - this.$el.append(@owner.render().el) if @item.is_own(@operators) + this.$el.append(@owner.render().el) if @item.is_own() this diff --git a/app/assets/javascripts/views/comics/show.js.coffee b/app/assets/javascripts/views/comics/show.js.coffee index 8b5ad411..71bae951 100644 --- a/app/assets/javascripts/views/comics/show.js.coffee +++ b/app/assets/javascripts/views/comics/show.js.coffee @@ -15,20 +15,18 @@ class Pettanr.Views.Comic.Show extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = Pettanr.url(@item.table_name(), 'play', {id: @item.get('id')}) prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.Scroll.ShowModule.Header({ item: @item, - operators: @operators, caption: @item.get('title'), icon_url: icon_url, caption_url: caption_url, prof_url: prof_url }) @author = new Pettanr.Views.Show.HeaderAuthor({item: @item}) - @owner = new Pettanr.Views.Comic.ShowModule.Owner({item: @item, operators: @operators}) + @owner = new Pettanr.Views.Comic.ShowModule.Owner({item: @item}) @listenTo(@header, 'click:pick', @click_pick) @listenTo(@header, 'click:icon', @click_show) @listenTo(@header, 'click:caption', @click_show) @@ -41,7 +39,7 @@ class Pettanr.Views.Comic.Show extends Backbone.View this.$el.html('') this.$el.append(@header.render().el) this.$el.append(@author.render().el) - this.$el.append(@owner.render().el) if @item.is_own(@operators) + this.$el.append(@owner.render().el) if @item.is_own() this click_show: () -> 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 a85c1064..c1827b66 100644 --- a/app/assets/javascripts/views/ground_colors/new_element.js.coffee +++ b/app/assets/javascripts/views/ground_colors/new_element.js.coffee @@ -39,7 +39,6 @@ class Pettanr.Views.GroundColor.NewElement extends Backbone.View item: item, element_form: true, submit: null, - operators: @editor().operators, }) dock: () -> diff --git a/app/assets/javascripts/views/ground_colors/show.js.coffee b/app/assets/javascripts/views/ground_colors/show.js.coffee index e91c7a50..4e1935ab 100644 --- a/app/assets/javascripts/views/ground_colors/show.js.coffee +++ b/app/assets/javascripts/views/ground_colors/show.js.coffee @@ -10,13 +10,11 @@ class Pettanr.Views.GroundColor.Show extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = icon_url prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.GroundColor.ShowModule.Header({ item: @item, - operators: @operators, caption: @item.get('caption'), icon_url: icon_url, caption_url: caption_url, @@ -32,7 +30,6 @@ class Pettanr.Views.GroundColor.Show extends Backbone.View @author = new Pettanr.Views.Show.HeaderAuthor({item: @panel}) @body = new Pettanr.Views.Panel.Body({ panel: @panel, - operators: @operators, spot: @item }) @credits = new Pettanr.Views.Panel.ShowModule.Credits({ diff --git a/app/assets/javascripts/views/ground_pictures/show.js.coffee b/app/assets/javascripts/views/ground_pictures/show.js.coffee index 37f688b8..913c6547 100644 --- a/app/assets/javascripts/views/ground_pictures/show.js.coffee +++ b/app/assets/javascripts/views/ground_pictures/show.js.coffee @@ -10,13 +10,11 @@ class Pettanr.Views.GroundPicture.Show extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = icon_url prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.GroundPicture.ShowModule.Header({ item: @item, - operators: @operators, caption: @item.get('caption'), icon_url: icon_url, caption_url: caption_url, @@ -32,7 +30,6 @@ class Pettanr.Views.GroundPicture.Show extends Backbone.View @author = new Pettanr.Views.Show.HeaderAuthor({item: @panel}) @body = new Pettanr.Views.Panel.Body({ panel: @panel, - operators: @operators, spot: @item }) @credits = new Pettanr.Views.Panel.ShowModule.Credits({ diff --git a/app/assets/javascripts/views/home/show.js.coffee b/app/assets/javascripts/views/home/show.js.coffee index ae6c0ace..548dcfa1 100644 --- a/app/assets/javascripts/views/home/show.js.coffee +++ b/app/assets/javascripts/views/home/show.js.coffee @@ -3,7 +3,6 @@ class Pettanr.Views.Home.Configure extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/layout.js.coffee b/app/assets/javascripts/views/layout.js.coffee index 5c891dfb..0d984b7b 100644 --- a/app/assets/javascripts/views/layout.js.coffee +++ b/app/assets/javascripts/views/layout.js.coffee @@ -5,8 +5,7 @@ class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base className: 'layout-sns' initialize: (options) -> - @operators = new Pettanr.Operator({}) - @global_router = new Pettanr.GlobalRouter({operators: @operators}) + @global_router = new Pettanr.GlobalRouter({}) @listenTo(@global_router, 'go', @body_get) @gate = new Pettanr.BeforeUnload() @header = new Pettanr.Views.Layout.Sns.Header({parent: this}) @@ -29,24 +28,22 @@ class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base init_operators: (user) -> author = new Pettanr.Author(user.get('author')) if user.get('author') artist = new Pettanr.Artist(user.get('artist')) if user.get('artist') - @operators.init({ + Pettanr.cache.operators.init({ user: user, author: author, artist: artist }) - @global_router.operators = @operators reset_operators: () -> - @operators.init({ + Pettanr.cache.operators.init({ user: null, author: null, artist: null }) - @global_router.operators = @operators start: () -> # check current user signed in? - proxy = new Pettanr.Proxy({operators: @operators}) + proxy = new Pettanr.Proxy({}) @listenTo(proxy, 'redirect', @test_redirect) # @listenTo(proxy, 'success', @test_ok) @listenTo(proxy, 'fail', @test_ng) @@ -78,7 +75,7 @@ class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base @history.disable() head_http_get: (url) -> - proxy = new Pettanr.Proxy({operators: @operators}) + proxy = new Pettanr.Proxy({}) @listenTo(proxy, 'ready', @head_ready) proxy.http_get(url, null) @@ -88,7 +85,7 @@ class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base @header.refresh(view) getter_proxy: () -> - proxy = new Pettanr.Proxy({operators: @operators, gate: @gate}) + proxy = new Pettanr.Proxy({gate: @gate}) @listenTo(proxy, 'ready', @body_ready) @listenTo(proxy, 'title', @body_title) @listenTo(proxy, 'title', @push_history) @@ -123,7 +120,7 @@ class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base $(document).attr('title', t + ' - ' + site_caption) poster_proxy: () -> - proxy = new Pettanr.Proxy({operators: @operators}) + proxy = new Pettanr.Proxy({}) @listenTo(proxy, 'success', @body_success) @listenTo(proxy, 'fail', @body_fail) @listenTo(proxy, 'redirect', @body_redirect) @@ -170,9 +167,7 @@ class Pettanr.Views.Layout.Blog extends Pettanr.Views.Layout.Base @body.navigate('top/demo') sign_in_fail: (user, response) -> - view = new Pettanr.Views.UserSeeeion.New({ - operators: @operators - }) + view = new Pettanr.Views.UserSeeeion.New({}) view.render() @body.navigate('top/demo') diff --git a/app/assets/javascripts/views/layouts/blog.js.coffee b/app/assets/javascripts/views/layouts/blog.js.coffee index d521ab31..9a166228 100644 --- a/app/assets/javascripts/views/layouts/blog.js.coffee +++ b/app/assets/javascripts/views/layouts/blog.js.coffee @@ -3,7 +3,6 @@ class Pettanr.Views.Layout.Blog.Header extends Backbone.View id: 'header' initialize: (options) -> - @operators = options.operators @router = new Pettanr.Router() @listenTo(@router, 'fire', @fire) @@ -13,7 +12,7 @@ class Pettanr.Views.Layout.Blog.Header extends Backbone.View fire: (params) -> c = Pettanr[Pettanr.camelize(params['controller']) + 'Controller'] - controller = new c(@operators) + controller = new c() controller.params = params @listenTo(controller, 'ready', @refresh) @listenTo(controller, 'retitle', @retitle) @@ -41,7 +40,6 @@ class Pettanr.Views.Layout.Blog.Body extends Backbone.View id: 'body' initialize: (options) -> - @operators = options.operators @router = new Pettanr.Router() @listenTo(@router, 'fire', @fire) @@ -51,7 +49,7 @@ class Pettanr.Views.Layout.Blog.Body extends Backbone.View fire: (params) -> c = Pettanr[Pettanr.camelize(params['controller']) + 'Controller'] - controller = new c(@operators) + controller = new c() controller.params = params @listenTo(controller, 'ready', @refresh) @listenTo(controller, 'retitle', @retitle) diff --git a/app/assets/javascripts/views/license_groups/show.js.coffee b/app/assets/javascripts/views/license_groups/show.js.coffee index 34bd1647..0c458399 100644 --- a/app/assets/javascripts/views/license_groups/show.js.coffee +++ b/app/assets/javascripts/views/license_groups/show.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.LicenseGroup.Show extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/licenses/show.js.coffee b/app/assets/javascripts/views/licenses/show.js.coffee index 3b94ad53..746edbe3 100644 --- a/app/assets/javascripts/views/licenses/show.js.coffee +++ b/app/assets/javascripts/views/licenses/show.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.License.Show extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/original_pictures/publish.js.coffee b/app/assets/javascripts/views/original_pictures/publish.js.coffee index 2fb8e16c..662422c1 100644 --- a/app/assets/javascripts/views/original_pictures/publish.js.coffee +++ b/app/assets/javascripts/views/original_pictures/publish.js.coffee @@ -39,7 +39,7 @@ class Pettanr.Views.OriginalPicture.Publish extends Backbone.View this is_own: () -> - if @item.is_own(@filer().operators) + if @item.is_own() true else false diff --git a/app/assets/javascripts/views/original_pictures/show.js.coffee b/app/assets/javascripts/views/original_pictures/show.js.coffee index 008d8560..3910dcb5 100644 --- a/app/assets/javascripts/views/original_pictures/show.js.coffee +++ b/app/assets/javascripts/views/original_pictures/show.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.OriginalPicture.Show extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/panel_pictures/show.js.coffee b/app/assets/javascripts/views/panel_pictures/show.js.coffee index 6f3ae7ce..6fa7b225 100644 --- a/app/assets/javascripts/views/panel_pictures/show.js.coffee +++ b/app/assets/javascripts/views/panel_pictures/show.js.coffee @@ -10,13 +10,11 @@ class Pettanr.Views.PanelPicture.Show extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = icon_url prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.PanelPicture.ShowModule.Header({ item: @item, - operators: @operators, caption: @item.get('caption'), icon_url: icon_url, caption_url: caption_url, @@ -32,7 +30,6 @@ class Pettanr.Views.PanelPicture.Show extends Backbone.View @author = new Pettanr.Views.Show.HeaderAuthor({item: @panel}) @body = new Pettanr.Views.Panel.Body({ panel: @panel, - operators: @operators, spot: @item }) @credits = new Pettanr.Views.Panel.ShowModule.Credits({ diff --git a/app/assets/javascripts/views/panels/body.js.coffee b/app/assets/javascripts/views/panels/body.js.coffee index 8d3e6260..af8f938f 100644 --- a/app/assets/javascripts/views/panels/body.js.coffee +++ b/app/assets/javascripts/views/panels/body.js.coffee @@ -1,12 +1,10 @@ # panel: panel item -# operators: operators # spot: no opacity element class Pettanr.Views.Panel.Body extends Backbone.View tagName: 'div' initialize: (options) -> @panel = options.panel - @operators = options.operators @spot = options.spot @class_name = 'pettanr-comic-panel' @views = [] @@ -31,7 +29,7 @@ class Pettanr.Views.Panel.Body extends Backbone.View this.$el.attr(attr) is_visible: () -> - @panel.is_visible(@operators) + @panel.is_visible() render_element: (index) -> @@ -106,7 +104,6 @@ class Pettanr.Views.Panel.Footer extends Backbone.View initialize: (options) -> @panel = options.panel - @operators = options.operators render: () -> this.$el.html('') @@ -127,7 +124,7 @@ class Pettanr.Views.Panel.Footer extends Backbone.View this.$el.append( Pettanr.AppHelper.distance_of_time_in_words_to_now(@panel.get('updated_at')) ) - if @panel.is_own(@operators) + if @panel.is_own() this.$el.append(@edit_button.render().el) click_panel: () -> diff --git a/app/assets/javascripts/views/panels/show.js.coffee b/app/assets/javascripts/views/panels/show.js.coffee index 02e84c03..9d2c68e4 100644 --- a/app/assets/javascripts/views/panels/show.js.coffee +++ b/app/assets/javascripts/views/panels/show.js.coffee @@ -1,17 +1,14 @@ # panel: panel item -# operators: operators # spot: no opacity element class Pettanr.Views.Panel.Show extends Backbone.View tagName: 'div' initialize: (options) -> @panel = options.panel - @operators = options.operators @spot = options.spot @header = new Pettanr.Views.Panel.ShowModule.Header({ item: @panel, - operators: @operators, caption: @panel.get('caption'), icon_url: @panel.show_url(), caption_url: @panel.show_url(), @@ -19,12 +16,10 @@ class Pettanr.Views.Panel.Show extends Backbone.View }) @body = new Pettanr.Views.Panel.Body({ panel: @panel, - operators: @operators, spot: @spot }) @footer = new Pettanr.Views.Panel.Footer({ panel: @panel, - operators: @operators }) @credits = new Pettanr.Views.Panel.ShowModule.Credits({ pictures: @panel.licensed_pictures() diff --git a/app/assets/javascripts/views/pictures/show.js.coffee b/app/assets/javascripts/views/pictures/show.js.coffee index 627c0321..89eb463e 100644 --- a/app/assets/javascripts/views/pictures/show.js.coffee +++ b/app/assets/javascripts/views/pictures/show.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.Picture.Show extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') 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 d5755500..aee19282 100644 --- a/app/assets/javascripts/views/resource_picture_pictures/show.js.coffee +++ b/app/assets/javascripts/views/resource_picture_pictures/show.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.ResourcePicturePicture.Show extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/resource_pictures/show.js.coffee b/app/assets/javascripts/views/resource_pictures/show.js.coffee index d7b716b4..39afdbbc 100644 --- a/app/assets/javascripts/views/resource_pictures/show.js.coffee +++ b/app/assets/javascripts/views/resource_pictures/show.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.ResourcePicture.Show extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/scrolls/play.js.coffee b/app/assets/javascripts/views/scrolls/play.js.coffee index b7de41d2..d6635c1f 100644 --- a/app/assets/javascripts/views/scrolls/play.js.coffee +++ b/app/assets/javascripts/views/scrolls/play.js.coffee @@ -16,7 +16,6 @@ class Pettanr.Views.Scroll.PlayModule.Footer extends Backbone.View initialize: (options) -> @panel = options.panel @scroll_panel = options.scroll_panel - @operators = options.operators render: () -> this.$el.html('') @@ -36,7 +35,7 @@ class Pettanr.Views.Scroll.PlayModule.Footer extends Backbone.View ) this.$el.append(Pettanr.AppHelper.distance_of_time_in_words_to_now(@scroll_panel.get('updated_at'))) # - if @panel.is_own(@operators) + if @panel.is_own() this.$el.append('') this @@ -69,7 +68,6 @@ class Pettanr.Views.Scroll.PlayModule.Panel extends Backbone.View initialize: (options) -> @scroll_panel = options.scroll_panel - @operators = options.operators clear: () -> this.$el.html('') @@ -88,19 +86,29 @@ class Pettanr.Views.Scroll.PlayModule.Panel extends Backbone.View @panel.attributes = @panel.replaced_attributes() body = new Pettanr.Views.Panel.Body({ panel: @panel, - operators: @operators, spot: null }) - this.$el.append(body.render().el) footer = new Pettanr.Views.Panel.Footer({ scroll_panel: @scroll_panel, panel: @panel, - operators: @operators }) + @listenTo(footer, 'click:panel', @click_show) + @listenTo(footer, 'click:author', @click_author) + @listenTo(footer, 'click:edit', @click_edit) + this.$el.append(body.render().el) this.$el.append(footer.render().el) @trigger('ready', @panel) this + click_show: () -> + @trigger('http_get', @panel.show_url()) + + click_author: () -> + @trigger('http_get', @panel.author().show_url()) + + click_edit: () -> + @trigger('http_get', @panel.edit_url()) + class Pettanr.Views.Scroll.PlayModule.Panels extends Backbone.View tagName: 'div' @@ -108,7 +116,6 @@ class Pettanr.Views.Scroll.PlayModule.Panels extends Backbone.View @parent = options.parent @items = options.items @credits = options.credits - @operators = options.operators render: () -> this.$el.html('') @@ -116,7 +123,6 @@ class Pettanr.Views.Scroll.PlayModule.Panels extends Backbone.View return if not scroll_panel.has_panel() panel_view = new Pettanr.Views.Scroll.PlayModule.Panel({ scroll_panel: scroll_panel, - operators: @operators, }) @listenTo(panel_view, 'ready', @ready) this.$el.append(panel_view.clear().el) @@ -131,7 +137,6 @@ class Pettanr.Views.Scroll.PlayModule.Body extends Backbone.View initialize: (options) -> @parent = options.parent @list = options.list - @operators = options.operators @items = @list.items() if @items.length < 1 @render_empty() @@ -151,8 +156,8 @@ class Pettanr.Views.Scroll.PlayModule.Body extends Backbone.View parent: this, items: @items, credits: credits, - operators: @operators }) + @listenTo(credits, 'click:credit:icon', @click_credit_icon) this.$el.append(panels.render().el) this.$el.append(credits.render().el) rb = new Tag.RowBreak() @@ -160,6 +165,9 @@ class Pettanr.Views.Scroll.PlayModule.Body extends Backbone.View # paginate(@pager) this + click_credit_icon: (item) -> + @trigger('http_get', item.show_url()) + class Pettanr.Views.Scroll.Play extends Backbone.View tagName: 'div' className: 'show' @@ -167,13 +175,11 @@ class Pettanr.Views.Scroll.Play extends Backbone.View initialize: (options) -> @item = options.item @list = options.list - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = Pettanr.url(@item.table_name(), 'play', {id: @item.get('id')}) prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.Scroll.PlayModule.Header({ item: @item, - operators: @operators, caption: @item.get('title'), icon_url: icon_url, caption_url: caption_url, @@ -183,15 +189,18 @@ class Pettanr.Views.Scroll.Play extends Backbone.View @body = new Pettanr.Views.Scroll.PlayModule.Body({ parent: this, list: @list, - operators: @operators }) - @owner = new Pettanr.Views.Scroll.PlayModule.Owner({item: @item, operators: @operators}) + @owner = new Pettanr.Views.Scroll.PlayModule.Owner({item: @item}) + @listenTo(@header, 'click:pick', @click_pick) + @listenTo(@header, 'click:icon', @click_show) + @listenTo(@header, 'click:caption', @click_show) + @listenTo(@header, 'click:prof', @click_prof) render: () -> this.$el.html('') this.$el.append(@header.render().el) this.$el.append(@author.render().el) this.$el.append(@body.render().el) - this.$el.append(@owner.render().el) if @item.is_own(@operators) + this.$el.append(@owner.render().el) if @item.is_own() this diff --git a/app/assets/javascripts/views/scrolls/show.js.coffee b/app/assets/javascripts/views/scrolls/show.js.coffee index cd25122e..9a7a82bb 100644 --- a/app/assets/javascripts/views/scrolls/show.js.coffee +++ b/app/assets/javascripts/views/scrolls/show.js.coffee @@ -15,17 +15,15 @@ class Pettanr.Views.Scroll.Show extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators @header = new Pettanr.Views.Scroll.ShowModule.Header({ item: @item, - operators: @operators, caption: @item.get('title'), icon_url: @item.show_url(), caption_url: @item.play_url(), prof_url: @item.prof_url() }) @author = new Pettanr.Views.Show.HeaderAuthor({item: @item}) - @owner = new Pettanr.Views.Scroll.ShowModule.Owner({item: @item, operators: @operators}) + @owner = new Pettanr.Views.Scroll.ShowModule.Owner({item: @item}) @listenTo(@header, 'click:pick', @click_pick) @listenTo(@header, 'click:icon', @click_show) @listenTo(@header, 'click:caption', @click_play) @@ -38,7 +36,7 @@ class Pettanr.Views.Scroll.Show extends Backbone.View this.$el.html('') this.$el.append(@header.render().el) this.$el.append(@author.render().el) - this.$el.append(@owner.render().el) if @item.is_own(@operators) + this.$el.append(@owner.render().el) if @item.is_own() this click_show: () -> diff --git a/app/assets/javascripts/views/sheets/play.js.coffee b/app/assets/javascripts/views/sheets/play.js.coffee index 3bce7426..5d20e34c 100644 --- a/app/assets/javascripts/views/sheets/play.js.coffee +++ b/app/assets/javascripts/views/sheets/play.js.coffee @@ -16,7 +16,6 @@ class Pettanr.Views.Sheet.PlayModule.Footer extends Backbone.View initialize: (options) -> @panel = options.panel @sheet_panel = options.sheet_panel - @operators = options.operators render: () -> this.$el.html('') @@ -36,7 +35,7 @@ class Pettanr.Views.Sheet.PlayModule.Footer extends Backbone.View ) this.$el.append(Pettanr.AppHelper.distance_of_time_in_words_to_now(@sheet_panel.get('updated_at'))) # - if @panel.is_own(@operators) + if @panel.is_own() this.$el.append('') this @@ -68,7 +67,6 @@ class Pettanr.Views.Sheet.PlayModule.Panel extends Backbone.View initialize: (options) -> @sheet_panel = options.sheet_panel - @operators = options.operators clear: () -> this.$el.html('') @@ -84,14 +82,12 @@ class Pettanr.Views.Sheet.PlayModule.Panel extends Backbone.View this.$el.html('') body = new Pettanr.Views.Panel.Body({ panel: @panel, - operators: @operators, spot: null }) this.$el.append(body.render().el) footer = new Pettanr.Views.Panel.Footer({ sheet_panel: sheet_panel, panel: @panel, - operators: @operators }) this.$el.append(footer.render().el) this.credits.push(@panel.licensed_pictures()) @@ -104,7 +100,6 @@ class Pettanr.Views.Sheet.PlayModule.Panels extends Backbone.View @parent = options.parent @items = options.items @credits = options.credits - @operators = options.operators render: () -> this.$el.html('') @@ -112,7 +107,6 @@ class Pettanr.Views.Sheet.PlayModule.Panels extends Backbone.View return if not sheet_panel.has_panel() panel_view = new Pettanr.Views.Sheet.PlayModule.Panel({ sheet_panel: sheet_panel, - operators: @operators, }) this.$el.append(panel_view.render().el) this @@ -123,7 +117,6 @@ class Pettanr.Views.Sheet.PlayModule.Body extends Backbone.View initialize: (options) -> @parent = options.parent @list = options.list - @operators = options.operators @items = @list.items() if @items.length < 1 @render_empty() @@ -143,7 +136,6 @@ class Pettanr.Views.Sheet.PlayModule.Body extends Backbone.View parent: this, items: @items, credits: credits, - operators: @operators }) this.$el.append(panels.render().el) this.$el.append(credits.render().el) @@ -159,13 +151,11 @@ class Pettanr.Views.Sheet.Play extends Backbone.View initialize: (options) -> @item = options.item @list = options.list - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = Pettanr.url(@item.table_name(), 'play', {id: @item.get('id')}) prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.Sheet.PlayModule.Header({ item: @item, - operators: @operators, caption: @item.get('caption'), icon_url: icon_url, caption_url: caption_url, @@ -175,15 +165,14 @@ class Pettanr.Views.Sheet.Play extends Backbone.View @body = new Pettanr.Views.Sheet.PlayModule.Body({ parent: this, list: @list, - operators: @operators }) - @owner = new Pettanr.Views.Sheet.PlayModule.Owner({item: @item, operators: @operators}) + @owner = new Pettanr.Views.Sheet.PlayModule.Owner({item: @item}) render: () -> this.$el.html('') this.$el.append(@header.render().el) this.$el.append(@author.render().el) this.$el.append(@body.render().el) - this.$el.append(@owner.render().el) if @item.is_own(@operators) + this.$el.append(@owner.render().el) if @item.is_own() this diff --git a/app/assets/javascripts/views/sheets/show.js.coffee b/app/assets/javascripts/views/sheets/show.js.coffee index f4cf5b25..048f8b9f 100644 --- a/app/assets/javascripts/views/sheets/show.js.coffee +++ b/app/assets/javascripts/views/sheets/show.js.coffee @@ -15,27 +15,25 @@ class Pettanr.Views.Sheet.Show extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = Pettanr.url(@item.table_name(), 'play', {id: @item.get('id')}) prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.Sheet.ShowModule.Header({ item: @item, caption: @item.get('caption'), - operators: @operators, icon_url: icon_url, caption_url: caption_url, prof_url: prof_url }) @author = new Pettanr.Views.Show.HeaderAuthor({item: @item}) - @owner = new Pettanr.Views.Sheet.ShowModule.Owner({item: @item, operators: @operators}) + @owner = new Pettanr.Views.Sheet.ShowModule.Owner({item: @item}) @listenTo(@header, 'click:pick', @click_pick) render: () -> this.$el.html('') this.$el.append(@header.render().el) this.$el.append(@author.render().el) - this.$el.append(@owner.render().el) if @item.is_own(@operators) + this.$el.append(@owner.render().el) if @item.is_own() this click_pick: () -> diff --git a/app/assets/javascripts/views/show.js.coffee b/app/assets/javascripts/views/show.js.coffee index d22d3acc..d1f16aa6 100644 --- a/app/assets/javascripts/views/show.js.coffee +++ b/app/assets/javascripts/views/show.js.coffee @@ -5,7 +5,6 @@ class Pettanr.Views.Show.Header extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators @title = options.caption @icon_url = options.icon_url @caption_url = options.caption_url @@ -119,7 +118,6 @@ class Pettanr.Views.Show.OwnerFooter extends Backbone.View initialize: (options) -> super(options) @item = options.item - @operators = options.operators @edit = new Pettanr.Views.Show.LinkedEditButton({item: @item}) @destroy = new Pettanr.Views.Show.LinkedDestroyButton({item: @item}) @listenTo(@edit, 'click', @click_edit) @@ -143,12 +141,11 @@ class Pettanr.Views.Show.Owner extends Backbone.View initialize: (options) -> super(options) @item = options.item - @operators = options.operators @header = new Tag.H3({ class_name: 'owner-header', content: I18n.t('editor') }) - @footer = new Pettanr.Views.Show.OwnerFooter({item: @item, operators: @operators}) + @footer = new Pettanr.Views.Show.OwnerFooter({item: @item}) @listenTo(@footer, 'click:edit', @click_edit) @listenTo(@footer, 'click:destroy', @click_destroy) 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 e8752c7f..3a1c86f5 100644 --- a/app/assets/javascripts/views/speech_balloon_templates/show.js.coffee +++ b/app/assets/javascripts/views/speech_balloon_templates/show.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.SpeechBalloonTemplate.Show extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/speech_balloons/show.js.coffee b/app/assets/javascripts/views/speech_balloons/show.js.coffee index 6d30a3eb..1b6f5019 100644 --- a/app/assets/javascripts/views/speech_balloons/show.js.coffee +++ b/app/assets/javascripts/views/speech_balloons/show.js.coffee @@ -10,13 +10,11 @@ class Pettanr.Views.SpeechBalloon.Show extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = icon_url prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.SpeechBalloon.ShowModule.Header({ item: @item, - operators: @operators, caption: @item.get('caption'), icon_url: icon_url, caption_url: caption_url, @@ -32,7 +30,6 @@ class Pettanr.Views.SpeechBalloon.Show extends Backbone.View @author = new Pettanr.Views.Show.HeaderAuthor({item: @panel}) @body = new Pettanr.Views.Panel.Body({ panel: @panel, - operators: @operators, spot: @item }) @credits = new Pettanr.Views.Panel.ShowModule.Credits({ diff --git a/app/assets/javascripts/views/speeches/show.js.coffee b/app/assets/javascripts/views/speeches/show.js.coffee index 88b1ba11..dc1b56d4 100644 --- a/app/assets/javascripts/views/speeches/show.js.coffee +++ b/app/assets/javascripts/views/speeches/show.js.coffee @@ -10,13 +10,11 @@ class Pettanr.Views.Speech.Show extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = icon_url prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.Speech.ShowModule.Header({ item: @item, - operators: @operators, caption: '', icon_url: icon_url, caption_url: caption_url, @@ -36,7 +34,6 @@ class Pettanr.Views.Speech.Show extends Backbone.View @author = new Pettanr.Views.Show.HeaderAuthor({item: @panel}) @body = new Pettanr.Views.Panel.Body({ panel: @panel, - operators: @operators, spot: @item }) @credits = new Pettanr.Views.Panel.ShowModule.Credits({ diff --git a/app/assets/javascripts/views/stories/play.js.coffee b/app/assets/javascripts/views/stories/play.js.coffee index 287a8e48..aae55dd0 100644 --- a/app/assets/javascripts/views/stories/play.js.coffee +++ b/app/assets/javascripts/views/stories/play.js.coffee @@ -16,7 +16,6 @@ class Pettanr.Views.Story.PlayModule.Footer extends Backbone.View initialize: (options) -> @panel = options.panel @scroll_panel = options.scroll_panel - @operators = options.operators render: () -> this.$el.html('') @@ -36,7 +35,7 @@ class Pettanr.Views.Story.PlayModule.Footer extends Backbone.View ) this.$el.append(Pettanr.AppHelper.distance_of_time_in_words_to_now(@scroll_panel.get('updated_at'))) # - if @panel.is_own(@operators) + if @panel.is_own() this.$el.append('') this @@ -68,7 +67,6 @@ class Pettanr.Views.Story.PlayModule.Sheet extends Backbone.View initialize: (options) -> @story_sheet = options.story_sheet - @operators = options.operators retriever = @story_sheet.sheet() @listenTo(retriever, 'retrieve', @retrieve_sheet) retriever.retrieve() @@ -81,7 +79,6 @@ class Pettanr.Views.Story.PlayModule.Sheet extends Backbone.View body = new Pettanr.Views.Sheet.PlayModule.Body({ parent: this, list: [], # list of sheets/by_story/1 - operators: @operators, }) this.$el.append(body.render().el) this @@ -92,7 +89,6 @@ class Pettanr.Views.Story.PlayModule.Sheets extends Backbone.View initialize: (options) -> @parent = options.parent @items = options.items - @operators = options.operators render: () -> this.$el.html('') @@ -100,7 +96,6 @@ class Pettanr.Views.Story.PlayModule.Sheets extends Backbone.View return if not story_sheet.has_sheet() sheet_view = new Pettanr.Views.Story.PlayModule.Sheet({ story_sheet: story_sheet, - operators: @operators, }) this.$el.append(sheet_view.render().el) this @@ -111,7 +106,6 @@ class Pettanr.Views.Story.PlayModule.Body extends Backbone.View initialize: (options) -> @parent = options.parent @list = options.list - @operators = options.operators @items = @list.items() if @items.length < 1 @render_empty() @@ -129,7 +123,6 @@ class Pettanr.Views.Story.PlayModule.Body extends Backbone.View sheets = new Pettanr.Views.Story.PlayModule.Sheets({ parent: this, items: @items, - operators: @operators }) this.$el.append(sheets.render().el) # paginate(@pager) @@ -142,13 +135,11 @@ class Pettanr.Views.Story.Play extends Backbone.View initialize: (options) -> @item = options.item @list = options.list - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = Pettanr.url(@item.table_name(), 'play', {id: @item.get('id')}) prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.Story.PlayModule.Header({ item: @item, - operators: @operators, caption: @item.get('title'), icon_url: icon_url, caption_url: caption_url, @@ -158,15 +149,14 @@ class Pettanr.Views.Story.Play extends Backbone.View @body = new Pettanr.Views.Story.PlayModule.Body({ parent: this, list: @list, - operators: @operators }) - @owner = new Pettanr.Views.Story.PlayModule.Owner({item: @item, operators: @operators}) + @owner = new Pettanr.Views.Story.PlayModule.Owner({item: @item}) render: () -> this.$el.html('') this.$el.append(@header.render().el) this.$el.append(@author.render().el) this.$el.append(@body.render().el) - this.$el.append(@owner.render().el) if @item.is_own(@operators) + this.$el.append(@owner.render().el) if @item.is_own() this diff --git a/app/assets/javascripts/views/stories/show.js.coffee b/app/assets/javascripts/views/stories/show.js.coffee index 730c386f..3b731d14 100644 --- a/app/assets/javascripts/views/stories/show.js.coffee +++ b/app/assets/javascripts/views/stories/show.js.coffee @@ -15,27 +15,25 @@ class Pettanr.Views.Story.Show extends Backbone.View initialize: (options) -> @item = options.item - @operators = options.operators icon_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id')}) caption_url = Pettanr.url(@item.table_name(), 'play', {id: @item.get('id')}) prof_url = Pettanr.url(@item.table_name(), 'show', {id: @item.get('id'), format: 'prof'}) @header = new Pettanr.Views.Story.ShowModule.Header({ item: @item, caption: @item.get('title'), - operators: @operators, icon_url: icon_url, caption_url: caption_url, prof_url: prof_url }) @author = new Pettanr.Views.Show.HeaderAuthor({item: @item}) - @owner = new Pettanr.Views.Story.ShowModule.Owner({item: @item, operators: @operators}) + @owner = new Pettanr.Views.Story.ShowModule.Owner({item: @item}) @listenTo(@header, 'click:pick', @click_pick) render: () -> this.$el.html('') this.$el.append(@header.render().el) this.$el.append(@author.render().el) - this.$el.append(@owner.render().el) if @item.is_own(@operators) + this.$el.append(@owner.render().el) if @item.is_own() this click_pick: () -> diff --git a/app/assets/javascripts/views/system_pictures/show.js.coffee b/app/assets/javascripts/views/system_pictures/show.js.coffee index 6ff7f791..d23d745d 100644 --- a/app/assets/javascripts/views/system_pictures/show.js.coffee +++ b/app/assets/javascripts/views/system_pictures/show.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.SystemPicture.Show extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/top/demo.js.coffee b/app/assets/javascripts/views/top/demo.js.coffee index 97d65ca0..76fffad1 100644 --- a/app/assets/javascripts/views/top/demo.js.coffee +++ b/app/assets/javascripts/views/top/demo.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.Top.Demo extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('Demo') diff --git a/app/assets/javascripts/views/user_sessions/new.js.coffee b/app/assets/javascripts/views/user_sessions/new.js.coffee index a765f966..5e4d90cd 100644 --- a/app/assets/javascripts/views/user_sessions/new.js.coffee +++ b/app/assets/javascripts/views/user_sessions/new.js.coffee @@ -3,7 +3,6 @@ class Pettanr.Views.UserSeeeion.New extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/users/account.js.coffee b/app/assets/javascripts/views/users/account.js.coffee index 419293ab..5acf90dd 100644 --- a/app/assets/javascripts/views/users/account.js.coffee +++ b/app/assets/javascripts/views/users/account.js.coffee @@ -3,9 +3,8 @@ class Pettanr.Views.User.Account extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators - @author = @operators.author - @artist = @operators.artist + @author = Pettanr.cache.operators.author + @artis = Pettanr.cache.operators.artist render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/writing_formats/show.js.coffee b/app/assets/javascripts/views/writing_formats/show.js.coffee index 683dde63..95c6ffd9 100644 --- a/app/assets/javascripts/views/writing_formats/show.js.coffee +++ b/app/assets/javascripts/views/writing_formats/show.js.coffee @@ -2,7 +2,6 @@ class Pettanr.Views.WritingFormat.Show extends Backbone.View tagName: 'div' initialize: (options) -> - @operators = options.operators render: () -> this.$el.html('') diff --git a/app/assets/stylesheets/resource_picture_pictures.css.scss b/app/assets/stylesheets/resource_picture_pictures.css.scss deleted file mode 100644 index 80f186ff..00000000 --- a/app/assets/stylesheets/resource_picture_pictures.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the resource_picture_pictures controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ -- 2.11.0