#88 - more comments for albums

ostapetc · Nov 1, 2012 · 1af0e17 · 1af0e17
1 parent dbb0b32
commit 1af0e17
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/js/comments/commentsPortlet.js b/js/comments/commentsPortlet.js
@@ -18,10 +18,7 @@ $.widget('cmsUI.commentList', {
         widget.label = $(widget.options.label_selector, widget.element);
         widget.list = $(widget.options.comments_list_selector, widget.element);
 
-        var $loading_div = $('<div>загрузка комментариев...</div>').css('text-align', 'center');
-
-        widget.list.html($loading_div);
-
+        widget.setLoading();
         widget._initAnswers();
         widget._initForm();
         if (!widget.options.is_hidden)
@@ -36,6 +33,11 @@ $.widget('cmsUI.commentList', {
         $("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;
@@ -85,13 +87,16 @@ $.widget('cmsUI.commentList', {
             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 : $("input[name='Comment[object_id]']", widget.form).val(),
-            model_id  : $("input[name='Comment[model_id]']", widget.form).val()
+            object_id : oid,
+            model_id  : mid
         },
         function(html)
         {
             widget.list.html(html);
-        });
+        }, 'html');
     }
-});
+});
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
@@ -34,9 +34,19 @@
 
             var layer_margin = $('#layer-margin').length ? $('#layer-margin') : $('<div id="layer-margin">').css('height', '100px');
             $('.fancybox-wrap').prependTo(overlay).append(layer_margin);
+
+            //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('setLoading');
+            comments_widget.commentList('loadCommentsList', {
+                url: F.current.element.data('comments-url')
+            });
         },
-        beforeClose: function()
+        beforeClose: function(opts)
         {
+            $('body').append($('#' + opts.comment_widget_id).hide());
             $('.fancybox-overlay').css('overflow-y', 'hidden');
         },
         afterClose: function ()

diff --git a/protected/modules/media/controllers/MediaVideoController.php b/protected/modules/media/controllers/MediaVideoController.php
@@ -10,9 +10,15 @@ public static function actionsTitles()
             "manage"       => "Поиск видео",
             "view"         => "Просмотр видео",
             "autocomplete" => "Скачать файл",
+            "v" => "Скачать файл",
         ];
     }
 
+    public function actionV()
+    {
+        echo 'alert(5); '.$_GET['callback'] . '({content:4})';
+    }
+
 
     public function actionAutocomplete($term)
     {