Browse Source

Make script cross browser compatible

release-0.6
thomascube 18 years ago
parent
commit
a0ce2f0fa1
  1. 17
      program/js/common.js
  2. 6
      program/js/list.js

17
program/js/common.js

@ -95,14 +95,23 @@ function roundcube_browser()
// static functions for event handling // static functions for event handling
var rcube_event = { var rcube_event = {
/**
/**
* returns the event target element
*/
get_target: function(e)
{
e = e || window.event;
return e && e.target ? e.target : e.srcElement;
},
/**
* returns the event key code * returns the event key code
*/ */
get_keycode: function(e)
{
get_keycode: function(e)
{
e = e || window.event; e = e || window.event;
return e && e.keyCode ? e.keyCode : (e && e.which ? e.which : 0); return e && e.keyCode ? e.keyCode : (e && e.which ? e.which : 0);
},
},
/** /**
* returns modifier key (constants defined at top of file) * returns modifier key (constants defined at top of file)

6
program/js/list.js

@ -210,7 +210,8 @@ drag_row: function(e, id)
this.in_selection_before = this.in_selection(id) ? id : false; this.in_selection_before = this.in_selection(id) ? id : false;
// don't do anything (another action processed before) // don't do anything (another action processed before)
if (this.dont_select || (e.target && (e.target.tagName == 'INPUT' || e.target.tagName == 'IMG')))
var evtarget = rcube_event.get_target(e);
if (this.dont_select || (evtarget && (evtarget.tagName == 'INPUT' || evtarget.tagName == 'IMG')))
return false; return false;
// selects currently unselected row // selects currently unselected row
@ -239,8 +240,9 @@ click_row: function(e, id)
{ {
var now = new Date().getTime(); var now = new Date().getTime();
var mod_key = rcube_event.get_modifier(e); var mod_key = rcube_event.get_modifier(e);
var evtarget = rcube_event.get_target(e);
if ((e.target && (e.target.tagName == 'INPUT' || e.target.tagName == 'IMG')))
if ((evtarget && (evtarget.tagName == 'INPUT' || evtarget.tagName == 'IMG')))
return false; return false;
// don't do anything (another action processed before) // don't do anything (another action processed before)

Loading…
Cancel
Save