merge

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

diff --git a/app/assets/javascripts/yasapp.js b/app/assets/javascripts/yasapp.js
index 194fa94..7aa6446 100644 (file)
--- a/app/assets/javascripts/yasapp.js
+++ b/app/assets/javascripts/yasapp.js
@@ -17,6 +17,9 @@
 //= require json2
 //= require backbone
 //= require i18n
+//= require ./pettanr
+//= require ./routes
+//= require ./view
 //= require ./tags
 //= require ./manifest_base/manifest_base
 //= require ./manifest_base/base
@@ -279,8 +282,6 @@
 //= require ./peta/binder
 //= require ./peta/leaf
 //= require ./peta/editize
-//= require ./pettanr
-//= require ./routes
 //= require ./controllers
 //= require ./views
 //= require ./editor
@@ -304,6 +305,11 @@
 //= require ./i18n/translations
 //= require_directory ./controllers
 //= require_directory ./models
+//= require_directory ./view
+//= require_directory ./view/button
+//= require_directory ./view/image
+//= require_directory ./view/show
+//= require_directory ./view/play
 //= require_directory ./views
 //= require_directory ./views/folders
 //= require_directory ./views/artists
@@ -350,11 +356,12 @@
 //= require_directory ./addons/square_speech_balloons
 //= require_directory ./addons/pettanr_simple_format
 //= require ./pettanr/picture
-//= require ./pettanr/pettan_imager
+//= require ./pettanr/file
 //= require ./pettanr/operator
 //= require ./pettanr/action_filter
 //= require ./pettanr/proxy
 //= require ./pettanr/cache
 //= require ./pettanr/inspire
+//= require ./pettanr/finder
 //= require ./backbone.fetch-cache
 //= require main