Merge commit 'pianohacker-koha/prefs-submit' into master

[koha-ffzg.git] / koha-tmpl / intranet-tmpl / prog / en / js / staff-global.js

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index c29ac0f..c2e6fba 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -1,21 +1,18 @@
 // staff-global.js
+if ( KOHA === undefined ) var KOHA = {};
 
 function _(s) { return s } // dummy function for gettext
 
  $(document).ready(function() {
        $(".focus").focus();
-       $('#header_search').tabs({
-               onShow: function() {
-               $('#header_search').find('div.residentsearch').not('.tabs-hide').find('input').eq(0).focus();
-           }   
-       });
-       $(".close").click(function(){
-               window.close();
-       });
+       $('#header_search > ul').tabs().bind('show.ui-tabs', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); });
+       $(".close").click(function(){ window.close(); });
+       if($("#header_search #checkin_search").length > 0){ $(document).bind('keydown','Alt+r',function (){ $("#header_search > ul").tabs("select","#checkin_search"); $("#ret_barcode").focus(); }); } else { $(document).bind('keydown','Alt+r',function (){ location.href="/cgi-bin/koha/circ/returns.pl"; }); }
+       if($("#header_search #circ_search").length > 0){ $(document).bind('keydown','Alt+u',function (){ $("#header_search > ul").tabs("select","#circ_search"); $("#findborrower").focus(); }); } else { $(document).bind('keydown','Alt+u',function(){ location.href="/cgi-bin/koha/circ/circulation.pl"; }); }
+       if($("#header_search #catalog_search").length > 0){ $(document).bind('keydown','Alt+q',function (){ $("#header_search > ul").tabs("select","#catalog_search"); $("#search-form").focus(); }); } else { $(document).bind('keydown','Alt+q',function(){ location.href="/cgi-bin/koha/catalogue/search.pl"; }); }
  });
  
-
-            YAHOO.util.Event.onContentReady("header", function () {
+             YAHOO.util.Event.onContentReady("header", function () {
                                var oMoremenu = new YAHOO.widget.Menu("moremenu", { zindex: 2 });
 
                                function positionoMoremenu() {
@@ -35,6 +32,7 @@ function _(s) { return s } // dummy function for gettext
                                function onShowMoreClick(p_oEvent) {
                     // Position and display the menu        
                     positionoMoremenu();
+                        $("#moremenu").show();
                     oMoremenu.show();
                     // Stop propagation and prevent the default "click" behavior
                     YAHOO.util.Event.stopEvent(p_oEvent);      
@@ -73,4 +71,22 @@ YAHOO.util.Event.onContentReady("changelanguage", function () {
                                YAHOO.util.Event.addListener("showlang", "click", onYahooClick);
 
                                YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMenu);
-            });
\ No newline at end of file
+            });
+                       
+// http://jennifermadden.com/javascript/stringEnterKeyDetector.html
+function checkEnter(e){ //e is event object passed from function invocation
+       var characterCode; // literal character code will be stored in this variable
+       if(e && e.which){ //if which property of event object is supported (NN4)
+               e = e;
+               characterCode = e.which; //character code is contained in NN4's which property
+       } else {
+               e = event;
+               characterCode = e.keyCode; //character code is contained in IE's keyCode property
+       }
+
+       if(characterCode == 13){ //if generated character code is equal to ascii 13 (if enter key)
+               return false;
+       } else {
+               return true;
+       }
+}