From 42c4f38d7b22751163bd3596d3c1056d7dc97638 Mon Sep 17 00:00:00 2001
From: Alexey Sharov <alexey.sharov@mebelrama.ru>
Date: Fri, 2 Nov 2012 13:11:03 +0400
Subject: [PATCH] #88 - clear comment list widget

---
 js/comments/commentsPortlet.js                | 54 +++++++++----------
 .../helpers/jquery.fancybox-vkstyle.js        |  6 +--
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/js/comments/commentsPortlet.js b/js/comments/commentsPortlet.js
index 73bce224..e80faedf 100644
--- a/js/comments/commentsPortlet.js
+++ b/js/comments/commentsPortlet.js
@@ -4,7 +4,6 @@ $.widget('cmsUI.commentList', {
         form_selector: '#comment-form',
         label_selector: "#comment-label",
         comments_list_selector: "#comments-div",
-        create_comments_url: "/comments/comment/create",
         comments_list_url: "/comments/comment/list",
         is_hidden: false
     },
@@ -26,18 +25,6 @@ $.widget('cmsUI.commentList', {
             widget.loadCommentsList();
         }
     },
-    bindTo: function(link)
-    {
-        var widget = this;
-        $("input[name='Comment[model_id]']", widget.form).val(link.data('model-id'));
-        $("input[name='Comment[object_id]']", widget.form).val(link.data('object-id'));
-        widget.form.attr('action', link.data('comments-url'));
-    },
-    setLoading: function() {
-        var widget = this;
-        var $loading_div = $('<div>загрузка комментариев...</div>').css('text-align', 'center');
-        widget.list.html($loading_div);
-    },
     _initForm:function()
     {
         var widget = this;
@@ -51,7 +38,7 @@ $.widget('cmsUI.commentList', {
                 params[$(this).attr('name')] = $(this).val();
             });
 
-            $.post(widget.options.create_comments_url, params, function(res)
+            $.post(widget.form.attr('action'), params, function(res)
             {
                 widget.loadCommentsList();
                 $("textarea[name='Comment[text]']", widget.form).val("");
@@ -78,25 +65,32 @@ $.widget('cmsUI.commentList', {
             return false;
         });
     },
+    bindToLink: function(link)
+    {
+        var widget = this;
+        $("input[name='Comment[model_id]']", widget.form).val(link.data('model-id'));
+        $("input[name='Comment[object_id]']", widget.form).val(link.data('object-id'));
+        widget.options.comments_list_url = link.data('comments-url');
+
+    },
+    setLoading: function()
+    {
+        var widget = this;
+        var $loading_div = $('<div>Загрузка комментариев...</div>').css('text-align', 'center');
+        widget.list.html($loading_div);
+    },
     loadCommentsList: function (opts)
     {
         //TODO: add cache! or make it outside?
         var widget = this;
-        var update_url = widget.options.comments_list_url;
-        if (opts && opts.url) {
-            update_url = opts.url;
-        }
-
-        var oid = $("input[name='Comment[object_id]']", widget.form).val(),
-            mid = $("input[name='Comment[model_id]']", widget.form).val();
-
-        $.get(update_url, {
-            object_id : oid,
-            model_id  : mid
-        },
-        function(html)
-        {
-            widget.list.html(html);
-        }, 'html');
+        $.get( widget.options.comments_list_url, {
+                object_id : $("input[name='Comment[object_id]']", widget.form).val(),
+                model_id  : $("input[name='Comment[model_id]']", widget.form).val()
+            },
+            function(html)
+            {
+                widget.list.html(html);
+            }, 'html'
+        );
     }
 });
\ No newline at end of file
diff --git a/protected/modules/media/assets/plugins/fancybox/helpers/jquery.fancybox-vkstyle.js b/protected/modules/media/assets/plugins/fancybox/helpers/jquery.fancybox-vkstyle.js
index a354cbb2..1d1236ca 100644
--- a/protected/modules/media/assets/plugins/fancybox/helpers/jquery.fancybox-vkstyle.js
+++ b/protected/modules/media/assets/plugins/fancybox/helpers/jquery.fancybox-vkstyle.js
@@ -38,11 +38,9 @@
             //comments
             var comments_widget = $('#' + opts.comment_widget_id);
             F.current.skin.append(comments_widget.show());
-            comments_widget.commentList('bindTo', F.current.element);
+            comments_widget.commentList('bindToLink', F.current.element);
             comments_widget.commentList('setLoading');
-            comments_widget.commentList('loadCommentsList', {
-                url: F.current.element.data('comments-url')
-            });
+            comments_widget.commentList('loadCommentsList');
         },
         beforeClose: function(opts)
         {