diff --git a/engine/lib/internal/template/js/comments.js b/engine/lib/internal/template/js/comments.js
index 5f2b81c0..c001a579 100644
--- a/engine/lib/internal/template/js/comments.js
+++ b/engine/lib/internal/template/js/comments.js
@@ -64,13 +64,13 @@ ls.comments = (function ($) {
this.load(targetId, targetType, result.sCommentId, true);
}
}.bind(this));
- }
+ };
// Активирует форму
this.enableFormComment = function() {
$('#form_comment_text').removeClass(this.options.classes.form_loader).attr('readonly',false);
- }
+ };
// Показывает/скрывает форму комментирования
@@ -97,7 +97,7 @@ ls.comments = (function ($) {
tinyMCE.execCommand('mceAddControl',true,'form_comment_text');
}
if (!bNoFocus) $('#form_comment_text').focus();
- }
+ };
// Подгружает новые комментарии
@@ -163,7 +163,7 @@ ls.comments = (function ($) {
this.checkFolding();
}
}.bind(this));
- }
+ };
// Вставка комментария
@@ -175,7 +175,7 @@ ls.comments = (function ($) {
$('#comments').append(newComment);
}
ls.hook.run('ls_comment_inject_after',arguments,newComment);
- }
+ };
// Удалить/восстановить комментарий
@@ -200,18 +200,20 @@ ls.comments = (function ($) {
$(obj).text(result.sTextToggle);
}
}.bind(this));
- }
+ };
// Предпросмотр комментария
- this.preview = function() {
+ this.preview = function(divPreview) {
+ var divPreview = divPreview ? divPreview : 'comment_preview_'+this.iCurrentShowFormComment;
+ ls.debug(divPreview);
if (this.options.wysiwyg) {
$("#form_comment_text").val(tinyMCE.activeEditor.getContent());
}
if ($("#form_comment_text").val() == '') return;
- $("#comment_preview_"+this.iCurrentShowFormComment).show();
- ls.tools.textPreview('form_comment_text', false, 'comment_preview_'+this.iCurrentShowFormComment);
- }
+ $("#"+divPreview).show();
+ ls.tools.textPreview('form_comment_text', false, divPreview);
+ };
// Устанавливает число новых комментариев
@@ -221,7 +223,7 @@ ls.comments = (function ($) {
} else {
$('#new_comments_counter').text(0).hide();
}
- }
+ };
// Вычисляет кол-во новых комментариев
@@ -231,7 +233,7 @@ ls.comments = (function ($) {
$.each(aCommentsNew,function(k,v){
this.aCommentNew.push(parseInt($(v).attr('id').replace('comment_id_','')));
}.bind(this));
- }
+ };
// Переход к следующему комментарию
@@ -243,7 +245,7 @@ ls.comments = (function ($) {
this.aCommentNew.shift();
}
this.setCountNewComment(this.aCommentNew.length);
- }
+ };
// Прокрутка к комментарию
@@ -255,7 +257,7 @@ ls.comments = (function ($) {
}
$('#comment_id_'+idComment).addClass(this.options.classes.comment_current);
this.iCurrentViewComment=idComment;
- }
+ };
// Прокрутка к родительскому комментарию
@@ -270,7 +272,7 @@ ls.comments = (function ($) {
});
this.scrollToComment(pid);
return false;
- }
+ };
// Сворачивание комментариев
@@ -286,27 +288,27 @@ ls.comments = (function ($) {
}
});
return false;
- }
+ };
this.expandComment = function(folding) {
$(folding).removeClass("folded").parent().nextAll(".comment-wrapper").show();
- }
+ };
this.collapseComment = function(folding) {
$(folding).addClass("folded").parent().nextAll(".comment-wrapper").hide();
- }
+ };
this.expandCommentAll = function() {
$.each($(".folding"),function(k,v){
this.expandComment(v);
- }.bind(this))
- }
+ }.bind(this));
+ };
this.collapseCommentAll = function() {
$.each($(".folding"),function(k,v){
this.collapseComment(v);
- }.bind(this))
- }
+ }.bind(this));
+ };
this.init = function() {
this.initEvent();
@@ -318,7 +320,7 @@ ls.comments = (function ($) {
this.options.wysiwyg = Boolean(BLOG_USE_TINYMCE && tinyMCE);
}
ls.hook.run('ls_comments_init_after',[],this);
- }
+ };
this.initEvent = function() {
$('#form_comment_text').bind('keyup', function(e) {
@@ -338,7 +340,7 @@ ls.comments = (function ($) {
}
}.bind(this));
}
- }
+ };
return this;
}).call(ls.comments || {},jQuery);
diff --git a/templates/skin/developer-jquery/actions/ActionAdmin/plugins.tpl b/templates/skin/developer-jquery/actions/ActionAdmin/plugins.tpl
index 52885d40..719f4929 100644
--- a/templates/skin/developer-jquery/actions/ActionAdmin/plugins.tpl
+++ b/templates/skin/developer-jquery/actions/ActionAdmin/plugins.tpl
@@ -10,7 +10,7 @@
{$aLang.plugins_plugin_name} |
{$aLang.plugins_plugin_version} |
{$aLang.plugins_plugin_author} |
- {$aLang.plugins_plugin_settings} |
+ {$aLang.plugins_plugin_settings} |
{$aLang.plugins_plugin_action} |
@@ -40,7 +40,7 @@
-
+
diff --git a/templates/skin/developer-jquery/actions/ActionTalk/inbox.tpl b/templates/skin/developer-jquery/actions/ActionTalk/inbox.tpl
index b9eadea5..746e3161 100644
--- a/templates/skin/developer-jquery/actions/ActionTalk/inbox.tpl
+++ b/templates/skin/developer-jquery/actions/ActionTalk/inbox.tpl
@@ -49,7 +49,7 @@
-
+
diff --git a/templates/skin/developer-jquery/menu.profile.tpl b/templates/skin/developer-jquery/menu.profile.tpl
index bf03cb4c..609ce57a 100644
--- a/templates/skin/developer-jquery/menu.profile.tpl
+++ b/templates/skin/developer-jquery/menu.profile.tpl
@@ -4,8 +4,8 @@
{if $sAction=='profile'}
{/if}
diff --git a/templates/skin/developer-jquery/topic_question.tpl b/templates/skin/developer-jquery/topic_question.tpl
index fa57acd6..86a7d5a4 100644
--- a/templates/skin/developer-jquery/topic_question.tpl
+++ b/templates/skin/developer-jquery/topic_question.tpl
@@ -26,11 +26,11 @@
{if !$oTopic->getUserQuestionIsVote()}
-
+
diff --git a/templates/skin/developer/menu.profile.tpl b/templates/skin/developer/menu.profile.tpl
index bf03cb4c..609ce57a 100644
--- a/templates/skin/developer/menu.profile.tpl
+++ b/templates/skin/developer/menu.profile.tpl
@@ -4,8 +4,8 @@
{if $sAction=='profile'}
{/if}
diff --git a/templates/skin/new-jquery/actions/ActionAdmin/plugins.tpl b/templates/skin/new-jquery/actions/ActionAdmin/plugins.tpl
index 1b084d8c..bd25152e 100644
--- a/templates/skin/new-jquery/actions/ActionAdmin/plugins.tpl
+++ b/templates/skin/new-jquery/actions/ActionAdmin/plugins.tpl
@@ -40,7 +40,7 @@
-
+
diff --git a/templates/skin/new-jquery/actions/ActionTalk/inbox.tpl b/templates/skin/new-jquery/actions/ActionTalk/inbox.tpl
index 6ac8f624..357508da 100644
--- a/templates/skin/new-jquery/actions/ActionTalk/inbox.tpl
+++ b/templates/skin/new-jquery/actions/ActionTalk/inbox.tpl
@@ -48,7 +48,7 @@
-
+
diff --git a/templates/skin/new-jquery/blog_list.tpl b/templates/skin/new-jquery/blog_list.tpl
index e1bfd89e..1aee159d 100644
--- a/templates/skin/new-jquery/blog_list.tpl
+++ b/templates/skin/new-jquery/blog_list.tpl
@@ -16,7 +16,7 @@
{$oBlog->getTitle()|escape:'html'}
{if $oBlog->getType()=='close'}
{/if}
- {$aLang.blogs_owner}: {$oUserOwner->getLogin()}
+ {$aLang.blogs_owner}: {$oUserOwner->getLogin()}
{if $oUserCurrent}
diff --git a/templates/skin/new-jquery/comment_tree.tpl b/templates/skin/new-jquery/comment_tree.tpl
index 1a7a37ec..a6903874 100644
--- a/templates/skin/new-jquery/comment_tree.tpl
+++ b/templates/skin/new-jquery/comment_tree.tpl
@@ -91,7 +91,7 @@
ed.onKeyPress.add(function(ed, e) {
key = e.keyCode || e.which;
if(e.ctrlKey && (key == 13)) {
- $('#comment-button-submit').click();
+ jQuery('#comment-button-submit').click();
return false;
}
});
@@ -106,7 +106,7 @@
jQuery(document).ready(function($){
ls.lang.load({lang_load name="panel_b,panel_i,panel_u,panel_s,panel_url,panel_url_promt,panel_code,panel_video,panel_image,panel_cut,panel_quote,panel_list,panel_list_ul,panel_list_ol,panel_title,panel_clear_tags,panel_video_promt,panel_list_li,panel_image_promt,panel_user,panel_user_promt"});
// Подключаем редактор
- $('#form_comment_text').markItUp(getMarkitupCommentSettings());
+ jQuery('#form_comment_text').markItUp(getMarkitupCommentSettings());
});
{/if}
diff --git a/templates/skin/new-jquery/menu.profile.tpl b/templates/skin/new-jquery/menu.profile.tpl
index b82eb599..02d8b007 100644
--- a/templates/skin/new-jquery/menu.profile.tpl
+++ b/templates/skin/new-jquery/menu.profile.tpl
@@ -4,8 +4,8 @@
{if $sAction=='profile'}
{/if}
diff --git a/templates/skin/new-jquery/topic_question.tpl b/templates/skin/new-jquery/topic_question.tpl
index 0ba74888..ac056b84 100644
--- a/templates/skin/new-jquery/topic_question.tpl
+++ b/templates/skin/new-jquery/topic_question.tpl
@@ -39,11 +39,11 @@
{if !$oTopic->getUserQuestionIsVote()}
-
+
diff --git a/templates/skin/new/actions/ActionBlog/admin.tpl b/templates/skin/new/actions/ActionBlog/admin.tpl
index 69062c62..3df2a27a 100644
--- a/templates/skin/new/actions/ActionBlog/admin.tpl
+++ b/templates/skin/new/actions/ActionBlog/admin.tpl
@@ -21,7 +21,7 @@
{foreach from=$aBlogUsers item=oBlogUser}
{assign var="oUser" value=$oBlogUser->getUser()}
|
- {$oUser->getLogin()} |
+ {$oUser->getLogin()} |
{if $oUser->getId()==$oUserCurrent->getId()}
{$aLang.blog_admin_users_current_administrator} |
{else}
diff --git a/templates/skin/new/blog_list.tpl b/templates/skin/new/blog_list.tpl
index 552a94c1..d8eff9ad 100644
--- a/templates/skin/new/blog_list.tpl
+++ b/templates/skin/new/blog_list.tpl
@@ -17,7 +17,7 @@
{$oBlog->getTitle()|escape:'html'}
- {$aLang.blogs_owner}: {$oUserOwner->getLogin()}
+ {$aLang.blogs_owner}: {$oUserOwner->getLogin()}
|
{if $oUserCurrent}
diff --git a/templates/skin/new/menu.profile.tpl b/templates/skin/new/menu.profile.tpl
index 38f1b362..d9dbdc8a 100644
--- a/templates/skin/new/menu.profile.tpl
+++ b/templates/skin/new/menu.profile.tpl
@@ -5,8 +5,8 @@
{if $sAction=='profile'}
{/if}
|