Merged bugfixes upto [0000072] (version 2.0.3).

[fa-stable.git] / js / inserts.js

diff --git a/js/inserts.js b/js/inserts.js
index ff479f30da60f652b708d94eee55a6453b3d6999..0eb4369f2224f8308070435beee347731544a89c 100644 (file)
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -138,6 +138,12 @@ function _set_combo_select(e) {
                                setFocus(box.name);
                            return false;
                         }
+                       if (this.getAttribute('aspect') == 'editable' && key==115) {
+                               // F4: call related database editor - not available in non-js fallback mode
+                               JsHttpRequest.request('_'+this.name+'_editor', this.form);
+                               return false; // prevent default binding
+                               // TODO: preventDefault, stopPropagation when needed
+                       }
                }
 }              
 
@@ -155,7 +161,19 @@ var inserts = {
                }
                if (e.className == 'combo' || e.className == 'combo2') {
                                _set_combo_input(e);
-               }
+               } 
+               else
+               if(e.type == 'text' ) {
+                               e.onkeydown = function(ev) { 
+                                       ev = ev||window.event;
+                                       key = ev.keyCode||ev.which;
+                                       if(key == 13) {
+                                               if(e.className == 'searchbox') e.onblur();
+                                               return false;
+                                       } 
+                                       return true;
+                               }
+                       }
        },
        'input.combo2,input[aspect="fallback"]': 
        function(e) {