From 8539fa3f3317b691133a419905f76268a3a5197b Mon Sep 17 00:00:00 2001
From: Sergey S Yaglov <sergey@yaglov.ru>
Date: Sun, 5 Feb 2012 14:01:58 +0300
Subject: [PATCH 1/3] blocks.js, event 'load' => 'loadResponse'

---
 engine/lib/internal/template/js/blocks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/lib/internal/template/js/blocks.js b/engine/lib/internal/template/js/blocks.js
index b7fc3fd6..034724f1 100644
--- a/engine/lib/internal/template/js/blocks.js
+++ b/engine/lib/internal/template/js/blocks.js
@@ -64,7 +64,7 @@ ls.blocks = (function ($) {
 	* Обработка результатов загрузки
 	*/
 	this.onLoad = function(content,id,result) {
-		$(this).trigger('load',arguments);
+		$(this).trigger('loadResponse',arguments);
 		content.empty();
 		if (result.bStateError) {
 			ls.msg.error(null, result.sMsg);

From 67d78e0dedc083aca8a96a543d028b16efb5aca3 Mon Sep 17 00:00:00 2001
From: Sergey S Yaglov <sergey@yaglov.ru>
Date: Tue, 7 Feb 2012 13:03:45 +0300
Subject: [PATCH 2/3] func_text_words, utf-8 support

---
 engine/include/function.php | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/engine/include/function.php b/engine/include/function.php
index 2d7481bd..8f55f224 100644
--- a/engine/include/function.php
+++ b/engine/include/function.php
@@ -277,25 +277,11 @@ function func_rmdir($sPath) {
  * @param unknown_type $iCountWords
  */
 function func_text_words($sText,$iCountWords) {
-	$sText=str_replace("\r\n",'[<rn>]',$sText);
-	$sText=str_replace("\n",'[<n>]',$sText);
-		
-	$iCount=0;
-	$aWordsResult=array();
-	$aWords=preg_split("/\s+/",$sText);	
-	for($i=0;$i<count($aWords);$i++) {
-		if ($iCount>=$iCountWords) {
-			break;
-		}
-		if ($aWords[$i]!='[<rn>]' and $aWords[$i]!='[<n>]') {
-			$aWordsResult[]=$aWords[$i];
-			$iCount++;
-		}
+	$aWords = preg_split('#[\s\r\n]+#um',$sText);
+	if($iCountWords < count($aWords)){
+		$aWords = array_slice($aWords,0,$iCountWords);
 	}
-	$sText=join(' ',$aWordsResult);	
-	$sText=str_replace('[<rn>]'," ",$sText);
-	$sText=str_replace('[<n>]'," ",$sText);	
-	return $sText;	
+	return join(' ', $aWords);	
 }
 
 /**

From 17fb3e5766462ec7b96d18269109bad2755c2f22 Mon Sep 17 00:00:00 2001
From: Sergey S Yaglov <sergey@yaglov.ru>
Date: Wed, 8 Feb 2012 10:21:05 +0300
Subject: [PATCH 3/3] -

---
 engine/lib/internal/template/js/blocks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/lib/internal/template/js/blocks.js b/engine/lib/internal/template/js/blocks.js
index 034724f1..b7fc3fd6 100644
--- a/engine/lib/internal/template/js/blocks.js
+++ b/engine/lib/internal/template/js/blocks.js
@@ -64,7 +64,7 @@ ls.blocks = (function ($) {
 	* Обработка результатов загрузки
 	*/
 	this.onLoad = function(content,id,result) {
-		$(this).trigger('loadResponse',arguments);
+		$(this).trigger('load',arguments);
 		content.empty();
 		if (result.bStateError) {
 			ls.msg.error(null, result.sMsg);