Merge branch 'develop' of projects.ceondo.com:indefero into feature.scilab

Conflicts: NEWS.mdtext
2012-03-22 00:51:39 +01:00
parent 562e6803c5 be2f0b3d62
commit f8a830802e
12 changed files with 120 additions and 163 deletions
--- a/src/IDF/Template/HotKey.php
+++ b/src/IDF/Template/HotKey.php
@@ -31,6 +31,6 @@ class IDF_Template_HotKey extends Pluf_Template_Tag
    function start($key, $view, $params=array(), $get_params=array())
    {
        $url = addslashes(Pluf_HTTP_URL_urlForView($view, $params, $get_params));
-        echo "jQuery.hotkeys.add('$key',{disableInInput: true},function (){window.location.href='$url';});";
+        echo "$(document).bind('keydown','$key',function (){window.location.href='$url';});";
    }
 }