Security update merged from 2.1.

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

diff --git a/js/inserts.js b/js/inserts.js
index dd78a9f607be68de748e56c8bfde841f26093e8a..4d665e843fbe8b6a73353a745a4cbe16ec7ed96b 100644 (file)
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -13,12 +13,6 @@ var _hotkeys = {
        'alt': false,   // whether is the Alt key pressed
        'focus': -1             // currently selected indeks of document.links
 };
-var _validate = {}; // validation functions
-
-function debug(msg) {
-    box = document.getElementById('msgbox')
-       box.innerHTML= box.innerHTML+'<br>'+msg
-}
 
 function save_focus(e) {
   _focus = e.name||e.id;
@@ -143,15 +137,39 @@ function _set_combo_select(e) {
                                setFocus(box);
                            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: stopPropagation when needed
-                       }
                }
 }              
 
+var _w;
+
+function callEditor(key) {
+  var el = document.getElementsByName(editors[key][1])[0]; 
+  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;
+  editors._call = key; // store call point for passBack 
+  _w.focus();
+}
+
+function passBack(value) {
+       var o = opener;
+       if(value != false) {
+               var back = o.editors[o.editors._call]; // form input bindings
+               var to = o.document.getElementsByName(back[1])[0];
+               if (to) {
+                       if (to[0] != undefined) 
+                               to[0].value = value; // ugly hack to set selector to any value
+                       to.value = value;
+                       // update page after item selection
+                       o.JsHttpRequest.request('_'+to.name+'_update', to.form);
+                       o.setFocus(to.name);
+               }
+       }
+       close();
+}
+
 /*
  Behaviour definitions
 */
@@ -195,10 +213,10 @@ var inserts = {
        function(e) {
                    e.onclick = function() {
                            save_focus(e);
-                               if (e.getAttribute('aspect') == 'process')
-                                       JsHttpRequest.request(this, null, 30000);
-                               else
-                                       JsHttpRequest.request(this);
+                                       if (e.getAttribute('aspect') == 'process')
+                                               JsHttpRequest.request(this, null, 30000);
+                                       else
+                                               JsHttpRequest.request(this);
                                return false;
                    }
        },
@@ -206,8 +224,8 @@ var inserts = {
                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() {
@@ -239,7 +257,13 @@ var inserts = {
                                        JsHttpRequest.request('_'+this.name+'_changed', this.form);
                                }
                        }
-               },
+       },
+       'button[aspect=selector], input[aspect=selector]': function(e) {
+               e.onclick = function() {
+                       passBack(this.getAttribute('rel'));
+                       return false;
+               }
+       },
        'select': function(e) {
                if(e.onfocus==undefined) {
                        e.onfocus = function() {
@@ -250,17 +274,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);
@@ -306,11 +319,11 @@ var inserts = {
                }
 
        },
-*/     '#msgbox': function(e) {
+*//*   '#msgbox': function(e) {
        // this is to avoid changing div height after ajax update in IE7
          e.style.display = e.innerHTML.length ? 'block' : 'none';
        }
-/* TODO
+*//* TODO
        'a.date_picker':  function(e) {
            // this un-hides data picker for js enabled browsers
            e.href = date_picker(this.getAttribute('rel'));
@@ -320,9 +333,14 @@ var inserts = {
 */
 };
 function stopEv(ev) {
-                       ev.returnValue = false;
-                       ev.cancelBubble = true;
-                       if(ev.preventDefault) ev.preventDefault();
+                       if(ev.preventDefault) {
+                               ev.preventDefault();
+                               ev.stopPropagation();
+                       } else {
+                               ev.returnValue = false;
+                               ev.cancelBubble = true;
+                               window.keycode = 0;
+                       }
                        return false;
 }
 /*
@@ -367,6 +385,11 @@ function setHotKeys() {
                                for (var i=0; i<form.elements.length; i++){
                                        var el = form.elements[i];
                                        var asp = el.getAttribute('aspect');
+                                       if (el.className!='editbutton' && asp=='selector' && (key==13 || key==27)) {
+                                               passBack(key==13 ? el.getAttribute('rel') : false);
+                                               ev.returnValue = false;
+                                               return false;
+                                       }
                                        if ((asp=='default' && key==13)||(asp=='cancel' && key==27)) {
                                                JsHttpRequest.request(el);
                                                ev.returnValue = false;
@@ -376,14 +399,18 @@ function setHotKeys() {
                        }
                        ev.returnValue = false;
                        return false;
+               }
+               if (editors && editors[key]) {
+                       callEditor(key);
+                       return stopEv(ev); // prevent default binding
                } 
                return true;
        };
        document.onkeyup = function(ev) {
-               if (_hotkeys.alt==true) {
-                       ev = ev||window.event;
-                       key = ev.keyCode||ev.which;
+               ev = ev||window.event;
+               key = ev.keyCode||ev.which;
 
+               if (_hotkeys.alt==true) {
                        if (key == 18) {
                                _hotkeys.alt = false;
                                if (_hotkeys.focus>=0) {