fix: show's destroy button

[pettanr/pettanr.git] / app / assets / javascripts / models / folder.js.coffee

diff --git a/app/assets/javascripts/models/folder.js.coffee b/app/assets/javascripts/models/folder.js.coffee
index dafdf52..f6caecc 100644 (file)
--- a/app/assets/javascripts/models/folder.js.coffee
+++ b/app/assets/javascripts/models/folder.js.coffee
@@ -1,5 +1,4 @@
 class Pettanr.Folder extends Peta.Owner\r
-  url: '/folders/'\r
   \r
   @singular: () ->\r
     'Folder'\r
@@ -16,8 +15,8 @@ class Pettanr.Folder extends Peta.Owner
     @get('name').replace(/\/$/, '').split('/').pop()\r
   \r
   filer_caption: () ->\r
-    @caption_text = @caption()\r
-    @trigger('ready:caption')\r
+    caption = _.escape(@caption())\r
+    @trigger('ready:caption', caption)\r
   \r
   is_remote: () ->\r
     if @get('category_id') == 10\r
@@ -28,6 +27,14 @@ class Pettanr.Folder extends Peta.Owner
   remote_name: () ->\r
     Pettanr.to_s(@get('controller_name')) + '/' + Pettanr.to_s(@get('action_name'))\r
   \r
+  remote_url: () ->\r
+    c = @get('controller_name')\r
+    a = if Pettanr.is_blank(@get('action_name'))\r
+      'index'\r
+    else\r
+      @get('action_name')\r
+    c + '/' + a\r
+  \r
   event_name: () ->\r
     a = if Pettanr.is_blank(@get('action_name'))\r
       'index'\r
@@ -35,18 +42,25 @@ class Pettanr.Folder extends Peta.Owner
       @get('action_name')\r
     Pettanr.to_s(@get('controller_name')) + '_' + a\r
   \r
-  initialize: () ->\r
-    if @id\r
-      @url = @url + @id\r
+  initialize: (attr = {}, options = {}) ->\r
+    super(attr, options)\r
   \r
 class Pettanr.FolderWatch extends Pettanr.Folder\r
-  initialize: () ->\r
-    super()\r
-    @url = @url + '?ref=1'\r
+  \r
+  initialize: (attr = {}, options = {}) ->\r
+    super(attr, options)\r
+    @url = @default_url() + '?ref=1'\r
+  \r
 class Pettanr.Folder.Root extends Pettanr.Folder\r
   model: Pettanr.Folder\r
-  url: '/folders/root?ref=1'\r
+  \r
+  initialize: (attr = {}, options = {}) ->\r
+    super(attr, options)\r
+    @url = @default_url() + 'root?ref=1'\r
+  \r
 class Pettanr.Folder.Children extends Backbone.Collection\r
   model: Pettanr.Folder\r
+  \r
   initialize: (options) ->\r
     @url = '/folders/' + options.id.toString()\r
+  \r