From 5574fc3bb0923c9505fbde7acab1a1d1e1959402 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Sat, 5 Nov 2011 10:40:09 +0400 Subject: [PATCH] =?UTF-8?q?fix=20js=20-=20=D0=B2=20jQuery=201.7=20trigger(?= =?UTF-8?q?)=20=D0=BF=D1=8B=D1=82=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=B2?= =?UTF-8?q?=D1=8B=D0=B7=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BE=D0=B4=D0=BD=D0=BE?= =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=BC=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B4=20=D1=83=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B5?= =?UTF-8?q?=D0=B3=D0=BE=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=B0,=20?= =?UTF-8?q?=D0=B2=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B8=20=D1=81=20=D1=8D=D1=82?= =?UTF-8?q?=D0=B8=D0=BC=20=D0=BF=D1=80=D0=B8=D1=88=D0=BB=D0=BE=D1=81=D1=8C?= =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=B2=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B5=20trigger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/skin/developer-jquery/js/blocks.js | 2 +- templates/skin/developer-jquery/js/favourite.js | 2 +- templates/skin/developer-jquery/js/vote.js | 2 +- templates/skin/new-jquery/js/blocks.js | 2 +- templates/skin/new-jquery/js/favourite.js | 2 +- templates/skin/new-jquery/js/vote.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/skin/developer-jquery/js/blocks.js b/templates/skin/developer-jquery/js/blocks.js index 2a9338c0..9785fe91 100644 --- a/templates/skin/developer-jquery/js/blocks.js +++ b/templates/skin/developer-jquery/js/blocks.js @@ -58,7 +58,7 @@ ls.blocks = (function ($) { * Обработка результатов загрузки */ this.onLoad = function(content,id,result) { - $(this).trigger('load',[content,id,result]); + $(this).trigger('loadSuccessful',[content,id,result]); content.empty(); if (result.bStateError) { ls.msg.error(null, result.sMsg); diff --git a/templates/skin/developer-jquery/js/favourite.js b/templates/skin/developer-jquery/js/favourite.js index a4eb914b..55058d8f 100644 --- a/templates/skin/developer-jquery/js/favourite.js +++ b/templates/skin/developer-jquery/js/favourite.js @@ -38,7 +38,7 @@ ls.favourite = (function ($) { params[this.options.type[type].targetName] = idTarget; ls.ajax(this.options.type[type].url, params, function(result) { - $(this).trigger('toggle',[idTarget,objFavourite,type,params,result]); + $(this).trigger('toggleSuccessful',[idTarget,objFavourite,type,params,result]); if (result.bStateError) { ls.msg.error(null, result.sMsg); } else { diff --git a/templates/skin/developer-jquery/js/vote.js b/templates/skin/developer-jquery/js/vote.js index 4d7a8c38..fbe1dc17 100644 --- a/templates/skin/developer-jquery/js/vote.js +++ b/templates/skin/developer-jquery/js/vote.js @@ -97,7 +97,7 @@ ls.vote = (function ($) { this[method].apply(this,[idTarget, objVote, value, type, result]); } } - $(this).trigger('vote',[idTarget, objVote, value, type, result]); + $(this).trigger('voteSuccessful',[idTarget, objVote, value, type, result]); } this.onVoteUser = function(idTarget, objVote, value, type, result) { diff --git a/templates/skin/new-jquery/js/blocks.js b/templates/skin/new-jquery/js/blocks.js index 9559380d..d17e756f 100644 --- a/templates/skin/new-jquery/js/blocks.js +++ b/templates/skin/new-jquery/js/blocks.js @@ -58,7 +58,7 @@ ls.blocks = (function ($) { * Обработка результатов загрузки */ this.onLoad = function(content,id,result) { - $(this).trigger('load',[content,id,result]); + $(this).trigger('loadSuccessful',[content,id,result]); content.empty(); if (result.bStateError) { ls.msg.error(null, result.sMsg); diff --git a/templates/skin/new-jquery/js/favourite.js b/templates/skin/new-jquery/js/favourite.js index 2b4c7996..a0f9a7c0 100644 --- a/templates/skin/new-jquery/js/favourite.js +++ b/templates/skin/new-jquery/js/favourite.js @@ -40,7 +40,7 @@ ls.favourite = (function ($) { params[this.options.type[type].targetName] = idTarget; ls.ajax(this.options.type[type].url, params, function(result) { - $(this).trigger('toggle',[idTarget,objFavourite,type,params,result]); + $(this).trigger('toggleSuccessful',[idTarget,objFavourite,type,params,result]); if (result.bStateError) { ls.msg.error(null, result.sMsg); } else { diff --git a/templates/skin/new-jquery/js/vote.js b/templates/skin/new-jquery/js/vote.js index 12878316..6c601792 100644 --- a/templates/skin/new-jquery/js/vote.js +++ b/templates/skin/new-jquery/js/vote.js @@ -97,7 +97,7 @@ ls.vote = (function ($) { this[method].apply(this,[idTarget, objVote, value, type, result]); } } - $(this).trigger('vote',[idTarget, objVote, value, type, result]); + $(this).trigger('voteSuccessful',[idTarget, objVote, value, type, result]); } this.onVoteUser = function(idTarget, objVote, value, type, result) {