From 2c0b3a366e43340277fffff7923c28221006969f Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 30 Oct 2012 09:27:23 -0400 Subject: [PATCH] fixed bug with keybinding in FireFox --- ChangeLog | 3 +++ client.js | 16 ++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c3719ac..1dcca43a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,9 @@ Keys was unbinded. (used document.location.href, now using document.location.origin) +* Fixed bug with keybinding in FireFox +(removed KeyBinding call on window load). + 2012.10.01, Version 0.1.7 diff --git a/client.js b/client.js index 1cba393c..2e88f8e2 100644 --- a/client.js +++ b/client.js @@ -1232,7 +1232,6 @@ CloudClient._currentToParent = function(pDirName){ */ CloudClient.init = function(){ Util = cloudcmd.Util; - KeyBinding = cloudcmd.KeyBinding; getByClass = Util.getByClass; getById = Util.getById; @@ -1252,22 +1251,21 @@ CloudClient.init = function(){ function initModules(){ loadModule({ + /* привязываем клавиши к функциям */ path : 'keyBinding.js', - func : function(){ - KeyBinding = cloudcmd.KeyBinding; + func : function(){ + KeyBinding = cloudcmd.KeyBinding; KeyBinding.init(); } }); - + Util.ajax({ url:'/modules.json', success: function(pModules){ if( Util.isArray(pModules) ) for(var i = 0, n = pModules.length; i < n ; i++) loadModule(pModules[i]); - }, - - error: baseInit + } }); } @@ -1341,6 +1339,7 @@ function baseInit(){ }); initModules(); + cloudcmd.KeyBinding(); } /* функция меняет ссыки на ajax-овые */ @@ -1691,9 +1690,6 @@ try{ /* базовая инициализация*/ CloudCommander.init(); - /* привязываем клавиши к функциям */ - CloudCommander.KeyBinding(); - /* загружаем Google Analytics */ CloudCommander.GoogleAnalytics(); };