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 90bed36..7178793 100644 (file)
--- a/app/assets/javascripts/ap.js
+++ b/app/assets/javascripts/ap.js
@@ -6,16 +6,17 @@
 //
 //= require jquery
 //= require jquery_ujs
-// require jquery.ui.all
+//= 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 backbone-relational
-//= require backbone.paginator
 //= require i18n
+//= require ./tags
 //= require ./manifest_base/manifest_base
 //= require ./manifest_base/base
 //= require ./manifest_base/factory
@@ -149,7 +150,15 @@
 //= 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
@@ -243,6 +252,16 @@
 //= 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
@@ -270,6 +289,7 @@
 //= 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
@@ -287,6 +307,7 @@
 //= 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
@@ -297,7 +318,6 @@
 //= require_directory ./addons/plain_speech_balloons
 //= require_directory ./addons/square_speech_balloons
 //= require_directory ./addons/pettanr_simple_format
-//= require ./pettanr/tags
 //= require ./pettanr/picture
 //= require ./pettanr/pettan_imager
 //= require ./pettanr/operator