[wixet] r395 committed - Corregido un problemilla de visualizacion que no dejaba ver emoticonos

[wi...@googlecode.com]

Revision: 395
Author: maxpowel
Date: Sat Sep 25 09:06:18 2010
Log: Corregido un problemilla de visualizacion que no dejaba ver emoticonos
http://code.google.com/p/wixet/source/detail?r=395

Modified:
/trunk/apps/core/modules/photo/actions/actions.class.php
/trunk/apps/core/modules/profile/actions/actions.class.php
/trunk/web/js/widget/widget-photoComments.js
/trunk/web/js/widget/widget-profileComments.js

=======================================
--- /trunk/apps/core/modules/photo/actions/actions.class.php Wed Sep 15
05:02:42 2010
+++ /trunk/apps/core/modules/photo/actions/actions.class.php Sat Sep 25
09:06:18 2010
@@ -184,7 +184,7 @@
$author = $comment->getAuthor();
$authorData = array();

- $authorData['name']=$author->getUsername();
+ $authorData['name']=$author->getFistname()." ".$author->getLastname();
$authorData['id']=$author->getId();
$authorData['face']=$author->getFace()->getPhotoId();

=======================================
--- /trunk/apps/core/modules/profile/actions/actions.class.php Wed Sep 1
18:04:29 2010
+++ /trunk/apps/core/modules/profile/actions/actions.class.php Sat Sep 25
09:06:18 2010
@@ -99,7 +99,7 @@
$author = $comment->getAuthor();
$authorData = array();

- $authorData['name']=$author->getUsername();
+ $authorData['name']=$author->getFirstname()." ".$author->getLastname();
$authorData['id']=$author->getId();
$authorData['face']=$author->getFace()->getPhotoId();

@@ -142,8 +142,10 @@
if(strlen($content)>0)
{
foreach($this->getUser()->getGuardUser()->getEmoticons() as
$emoticon){
- $content = str_ireplace($emoticon->getShortKey(), "<img
src='images/emoticons/".$emoticon->getId().".png' border='0'>", $content);
- }
+ $content = str_ireplace($emoticon->getShortKey(), "<img
src='images/emoticons/".$emoticon->getId().".png' border='0'>", $content);
+
+ }
+ echo $content;
$comment->setComment($content);
$soundId = $request->getParameter("sound");
if($soundId){
=======================================
--- /trunk/web/js/widget/widget-photoComments.js Mon Sep 20 09:07:34 2010
+++ /trunk/web/js/widget/widget-photoComments.js Sat Sep 25 09:06:18 2010
@@ -49,7 +49,7 @@
' <td valign="top"><div style="color: rgb(0, 0, 0);">'+
' <a class="ui-helper-reset"
href="#profile/loadProfile/id/'+comment.author.id+'" rel="history"
style="color: rgb(0, 0, 0);">'+
comment.author.name+
- ' </a>'+
+ ' ,</a>'+
' <span>'+$._datetime(comment.date)+'</b></span>'+
player +
' </div>'+
@@ -73,7 +73,6 @@
var widget = this.widget;
var id = $.url.getParam("id");
this.widget.find("#but-sendComment").click(function(){
- console.log("aaa");
if(widget.find("#cont-writeComment").find(".text").html().length > 0)
{

widget.find("#cont-writeComment").editor({send: "/core.php/photo/comment/id/"+id,
callback: function(){ $.widget.photoComments.paginate(1) }});
@@ -114,7 +113,7 @@
});

$.each(this.widget.find(".comment"),function(i,comment){
- var text = $(comment).text();
+ var text = $(comment).html();
$(comment).html("").append($.youtubePlayer.parseText(text));
});
}
=======================================
--- /trunk/web/js/widget/widget-profileComments.js Mon Sep 20 09:07:34 2010
+++ /trunk/web/js/widget/widget-profileComments.js Sat Sep 25 09:06:18 2010
@@ -56,24 +56,24 @@
' <td valign="top"><div style="color: rgb(0, 0, 0);">'+
' <a class="ui-helper-reset"
href="#profile/loadProfile/id/'+comment.author.id+'" rel="history"
style="color: rgb(0, 0, 0);">'+
comment.author.name+
- ' </a>'+
+ ' ,</a>'+
' <span>'+$._datetime(comment.date)+'</b></span>'+
player +
' </div>'+
' <div>'+
- ' <div class="comment" style="color: rgb(0, 0, 255);
font-family: times new roman,times;">'+comment.comment+'</div>'+
+ ' <div class="comment" style="color: rgb(0, 0, 255);
font-family: times new roman,times;"></div>'+
' </div>'+
' </td>'+
' </tr>'+
'</tbody>'+
'</table>'+
- '<div><br/></div>');
+ '<div><br/></div>');
+ commentObj.find(".comment").append(comment.comment);
commentList.append(commentObj);
});
thisWidget.prepareComments();

widget.find("#cont-comments").fadeIn("slow");
-
});
},
prepareComments: function(){
@@ -91,7 +91,7 @@
});

$.each(this.widget.find(".comment"),function(i,comment){
- var text = $(comment).text();
+ var text = $(comment).html();
$(comment).html("").append($.youtubePlayer.parseText(text));
});
}