Merge branch 'master' of github.com:roundcube/roundcubemail

pull/193/head
Aleksander Machniak 11 years ago
commit 6201aaf1cd

@ -1035,7 +1035,7 @@ invert_selection: function()
/**
* Unselect selected row(s)
*/
clear_selection: function(id)
clear_selection: function(id, no_event)
{
var n, num_select = this.selection.length;
@ -1057,7 +1057,7 @@ clear_selection: function(id)
this.selection = [];
}
if (num_select && !this.selection.length)
if (num_select && !this.selection.length && !no_event)
this.triggerEvent('select');
},
@ -1110,7 +1110,7 @@ highlight_row: function(id, multiple, norecur)
if (!multiple) {
if (this.selection.length > 1 || !this.in_selection(id)) {
this.clear_selection();
this.clear_selection(null, true);
this.selection[0] = id;
$(this.rows[id].obj).addClass('selected');
}

@ -182,7 +182,7 @@ class rcube_plugin_api
}
// plugin already loaded
if ($this->plugins[$plugin_name] || class_exists($plugin_name, false)) {
if ($this->plugins[$plugin_name]) {
return true;
}
@ -190,7 +190,9 @@ class rcube_plugin_api
. DIRECTORY_SEPARATOR . $plugin_name . '.php';
if (file_exists($fn)) {
include $fn;
if (!class_exists($plugin_name, false)) {
include $fn;
}
// instantiate class if exists
if (class_exists($plugin_name, false)) {

Loading…
Cancel
Save