Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / app / assets / javascripts / ap.js

diff --git a/app/assets/javascripts/ap.js b/app/assets/javascripts/ap.js
index 5162023..7178793 100644 (file)
--- a/app/assets/javascripts/ap.js
+++ b/app/assets/javascripts/ap.js
@@ -4,14 +4,19 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require jquery.ui.all
+//= require jquery
+//= require jquery_ujs
+//= require jquery-ui
 //require jquery.validate
 //require additional-methods
 //require jquery.validate.localization/messages_ja
+//= require rails-timeago
+//= require locales/jquery.timeago.ja.js
 //= require textchange
 //= require underscore
 //= require backbone
 //= require i18n
+//= require ./tags
 //= require ./manifest_base/manifest_base
 //= require ./manifest_base/base
 //= require ./manifest_base/factory
@@ -145,11 +150,20 @@
 //= require ./local_manifest/form/element_field
 //= require ./local_manifest/form/part_field
 //= require ./local_manifest/list_group
-//= require ./local_manifest/list_group/
+//= require ./local_manifest/list_group/list
+//= require ./local_manifest/list_group/list/base
+//= require ./local_manifest/list_group/list/public
+//= require ./local_manifest/list_group/list/private
+//= require ./local_manifest/list_group/list/system_resource
+//= require ./local_manifest/list_group/list/filter
+//= require ./local_manifest/list_group/list/through_filter
+//= require ./local_manifest/list_group/list/foreign_filter
+//= require ./local_manifest/list_group/list/play
 //= require ./local_manifest/bucket
 //= require ./local_manifest/bucket/member
 //= require ./local_manifest/bucket/form_field_name
 //= require ./locmare/locmare
+//= require ./locmare/booster
 //= require ./locmare/filer
 //= require ./locmare/filer/header
 //= require ./locmare/filer/body
@@ -205,7 +219,49 @@
 //= require ./locmare/filer/body/file_body/file_item/edit/none
 //= require ./locmare/filer/body/file_body/file_item/edit/account
 //= require ./locmare/filer/body/file_body/file_item/edit/template
-//  require ./locmare/filer/pager
+//= require ./locmare/filer/pager
+//= require ./locmare/profiler
+//= require ./locmare/profiler/header
+//= require ./locmare/profiler/column
+//= require ./locmare/profiler/column/base
+//= require ./locmare/profiler/column/default
+//= require ./locmare/profiler/column/date
+//= require ./locmare/profiler/column/source
+//= require ./locmare/profiler/column/extend
+//= require ./locmare/profiler/column/extend/extend_column
+//= require ./locmare/profiler/column/json
+//= require ./locmare/profiler/association
+//= require ./locmare/profiler/association/belongs_to
+//= require ./locmare/profiler/association/has_many
+//= require ./locmare/profiler/association/has_one
+//= require ./locmare/form
+//= require ./locmare/form/field
+//= require ./locmare/form/extend_field
+//= require ./locmare/form/field/label
+//= require ./locmare/form/field/label/label
+//= require ./locmare/form/field/tag
+//= require ./locmare/form/field/tag/base
+//= require ./locmare/form/field/tag/text
+//= require ./locmare/form/field/tag/number
+//= require ./locmare/form/field/tag/text_area
+//= require ./locmare/form/field/tag/select
+//= require ./locmare/form/field/tag/hidden
+//= require ./locmare/form/field/helper
+//= require ./locmare/form/field/helper/base
+//= require ./locmare/form/field/helper/size
+//= require ./locmare/form/field/helper/tail_angle
+//= require ./locmare/form/field/helper/color
+//= require ./locmare/form/field/helper/popup
+//= require ./locmare/bucket
+//= require ./locmare/list_group
+//= require ./locmare/list_group/list/base
+//= require ./locmare/list_group/list/public
+//= require ./locmare/list_group/list/private
+//= require ./locmare/list_group/list/system_resource
+//= require ./locmare/list_group/list/filter
+//= require ./locmare/list_group/list/through_filter
+//= require ./locmare/list_group/list/foreign_filter
+//= require ./locmare/list_group/list/play
 //= require ./peta/peta
 //= require ./peta/item
 //= require ./peta/owner
@@ -220,9 +276,49 @@
 //= require ./peta/editize
 //= require ./pettanr
 //= require ./routes
+//= require ./views
 //= require ./i18n/translations
 //= require_directory ./controllers
 //= require_directory ./models
 //= require_directory ./views
-//= require_directory ./pettanr
+//= require_directory ./views/folders
+//= require_directory ./views/artists
+//= require_directory ./views/authors
+//= require_directory ./views/balloons
+//= require_directory ./views/comics
+//= require_directory ./views/comic_stories
+//= require_directory ./views/ground_colors
+//= require_directory ./views/ground_pictures
+//= require_directory ./views/home
+//= require_directory ./views/licenses
+//= require_directory ./views/license_groups
+//= require_directory ./views/original_pictures
+//= require_directory ./views/panels
+//= require_directory ./views/panel_pictures
+//= require_directory ./views/pictures
+//= require_directory ./views/resource_pictures
+//= require_directory ./views/scrolls
+//= require_directory ./views/scroll_panels
+//= require_directory ./views/sheets
+//= require_directory ./views/sheet_panels
+//= require_directory ./views/speeches
+//= require_directory ./views/speech_balloons
+//= require_directory ./views/speech_balloon_templates
+//= require_directory ./views/stories
+//= require_directory ./views/story_sheets
+//= require_directory ./views/system_pictures
+//= require_directory ./views/writing_formats
+//= require_directory ./addons/pettanr_creative_commons_v30_licenses
+//= require_directory ./addons/pettanr_pettan_commons_v01_licenses
+//= require_directory ./addons/pettanr_pettan_protected_v01_licenses
+//= require_directory ./addons/pettanr_pettan_public_v01_licenses
+//= require_directory ./addons/pettanr_public_domain_v01_licenses
+//= require_directory ./addons/pettanr_unknown_v01_licenses
+//= require_directory ./addons/circle_speech_balloons
+//= require_directory ./addons/plain_speech_balloons
+//= require_directory ./addons/square_speech_balloons
+//= require_directory ./addons/pettanr_simple_format
+//= require ./pettanr/picture
+//= require ./pettanr/pettan_imager
+//= require ./pettanr/operator
 //= require main