Merged changes from main trunk up to 2.2.7

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

diff --git a/js/inserts.js b/js/inserts.js
index 745aa2c7631b0df66ad55320e18c6e47011a1ba4..3ed5e314546cb0c744eeba59d8242a201e6f0351 100644 (file)
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -53,8 +53,9 @@ function _set_combo_input(e) {
                  save_focus(select);
 // submit request if there is submit_on_change option set and 
 // search field has changed.
+               
                  if (button && (this.value != this.getAttribute('_last'))) {
-                       JsHttpRequest.request(button);
+                       JsHttpRequest.request(button);
                  } else if(this.className=='combo2') {
                                this.style.display = 'none';
                                select.style.display = 'inline';
@@ -95,8 +96,10 @@ function _update_box(s) {
                if(box && s.selectedIndex>=0) {
                          var opt = s.options[s.selectedIndex];
                                if(box) {
+                                 var old = box.value;
                                  box.value = byid ? opt.value : opt.text;
                                  box.setAttribute('_last', box.value);
+                                 return old != box.value
                                }
                }
 }
@@ -107,10 +110,13 @@ function _set_combo_select(e) {
                // signaling we must track selectedIndex in onblur handler.
                e.setAttribute('_last', e.selectedIndex);
                e.onblur = function() {
-                       if(this.className=='combo')
-                           _update_box(this);
-                       if (this.selectedIndex != this.getAttribute('_last'))
-                               this.onchange();
+                   var box = document.getElementsByName(this.getAttribute('rel'))[0];
+//                     if(this.className=='combo')
+//                         _update_box(this);
+                       if ((this.selectedIndex != this.getAttribute('_last'))
+                               ||(this.className=='combo' && _update_box(this))
+                               )
+                                       this.onchange();
                }
                e.onchange = function() {
                        var s = this;
@@ -140,14 +146,17 @@ function _set_combo_select(e) {
                }
 }              
 
+var _w;
+
 function callEditor(key) {
   var el = document.getElementsByName(editors[key][1])[0]; 
-  w = open(editors[key][0]+el.value+'&popup=1',
+  if(_w) _w.close(); // this is really necessary to have window on top in FF2 :/
+  _w = open(editors[key][0]+el.value+'&popup=1',
          "edit","Scrollbars=0,resizable=0,width=800,height=600");
-  if (w.opener == null)
-         w.opener = self;
+  if (_w.opener == null)
+         _w.opener = self;
   editors._call = key; // store call point for passBack 
-  w.focus();
+  _w.focus();
 }
 
 function passBack(value) {
@@ -211,18 +220,18 @@ var inserts = {
                    e.onclick = function() {
                            save_focus(e);
                                        if (e.getAttribute('aspect') == 'process')
-                                               JsHttpRequest.request(this, null, 30000);
+                                               JsHttpRequest.request(this, null, 60000);
                                        else
                                                JsHttpRequest.request(this);
                                return false;
                    }
        },
-/*     'button': function(e) {
+       'button': function(e) {
                if (e.name) {
                        var func = _validate[e.name];
                        var old = e.onclick;
-                       if(func) {
-                               if (typeof old != 'function') {
+                       if(func) { 
+                               if (typeof old != 'function' || old == func) { // prevent multiply binding on ajax update
                                        e.onclick = func;
                                } else {
                                        e.onclick = function() {
@@ -235,7 +244,7 @@ var inserts = {
                        }
                }
        },
-*/    '.amount': function(e) {
+    '.amount': function(e) {
                if(e.onblur==undefined) {
                  e.onblur = function() {
                        var dec = this.getAttribute("dec");
@@ -255,12 +264,29 @@ var inserts = {
                                }
                        }
        },
-       'button[aspect=selector], input[aspect=selector]': function(e) {
+       'button[aspect=selector], button[aspect=abort], input[aspect=selector]': function(e) {
                e.onclick = function() {
                        passBack(this.getAttribute('rel'));
                        return false;
                }
        },
+       'button[aspect=popup]': function(e) {
+                                               var old = e.onclick
+               e.onclick = function() {
+//                     this.form.target = '_blank';
+//                             old();
+//                     return true;
+                       if(_w) _w.close(); // this is really necessary to have window on top in FF2 :/
+                         _w = open(document.location+'popup=1',
+                                 "edit","Scrollbars=0,resizable=0,width=800,height=600, top=50,left=50");
+                         if (_w.opener == null)
+                                 _w.opener = self;
+                       //  editors._call = key; // store call point for passBack 
+//                       _w.moveTo(50, 50);
+                         _w.focus();
+                       return false;
+               }
+       },
        'select': function(e) {
                if(e.onfocus==undefined) {
                        e.onfocus = function() {
@@ -271,17 +297,6 @@ var inserts = {
                        _set_combo_select(e);
                }
        },
-       'textarea,a': function(e) {
-               if(e.onfocus==undefined) {
-                       e.onfocus = function() {
-                           save_focus(this);
-                       };
-                       e.onmouseover = function(e) {
-                       setFocus(this);
-                               return false;
-                       }
-               }
-       },
        'a.printlink':  function(l) {
                l.onclick = function() {
                    save_focus(this);
@@ -313,7 +328,7 @@ var inserts = {
                    }
                }
            }
-       },
+       }
 /*     'tr.editrow': function(e) {
                        e.onkeydown = function(ev) { 
                        ev = ev||window.event;
@@ -340,6 +355,7 @@ var inserts = {
        }
 */
 };
+
 function stopEv(ev) {
                        if(ev.preventDefault) {
                                ev.preventDefault();
@@ -364,7 +380,7 @@ function setHotKeys() {
                        _hotkeys.focus = -1;
                        return stopEv(ev);
                }
-               else if (_hotkeys.alt && ((key>47 && key<58) || (key>64 && key<91))) {
+               else if (ev.altKey && !ev.ctrlKey && ((key>47 && key<58) || (key>64 && key<91))) {
                        var n = _hotkeys.focus;
                        var l = document.links;
                        var cnt = l.length;