extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 01:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove some lingering inline js

Browse Source
This commit is contained in:
Nathan Gray 2016-02-17 16:05:30 +00:00
parent e3fdbd0c62
commit e61cc619f1
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
importexport/inc/class.importexport_export_ui.inc.php
View File

@ -211,7 +211,6 @@ class importexport_export_ui {
$content['filter']['fields'] = importexport_helper_functions::get_filter_fields($_appname, $selected_plugin); $content['filter']['fields'] = importexport_helper_functions::get_filter_fields($_appname, $selected_plugin);
if(!$content['filter']['fields']) if(!$content['filter']['fields'])
{ {
$this->js->set_onload("\$j('input[value=\"filter\"]').parent().hide();");
$content['no_filter'] = true; $content['no_filter'] = true;
} }
else else
@ -241,13 +240,7 @@ class importexport_export_ui {
$content['selection'] = 'search'; $content['selection'] = 'search';
} }
// Disable / hide definition filter if not selected
if($content['selection'] != 'filter')
{
$this->js->set_onload("
\$j('div.filters').hide();
");
}
unset ($plugin_object); unset ($plugin_object);
$apps = importexport_helper_functions::get_apps('export'); $apps = importexport_helper_functions::get_apps('export');
//error_log(__METHOD__.__LINE__.array2string($apps)); //error_log(__METHOD__.__LINE__.array2string($apps));

21
importexport/js/app.js
View File

@ -50,11 +50,24 @@ app.classes.importexport = AppJS.extend(
// call parent // call parent
this._super.apply(this, arguments); this._super.apply(this, arguments);
if(this.et2.getWidgetById('export') && !this.et2.getArrayMgr("content").getEntry("definition")) if(this.et2.getWidgetById('export'))
{ {
// et2 doesn't understand a disabled button in the normal sense if(!this.et2.getArrayMgr("content").getEntry("definition"))
$j(this.et2.getWidgetById('export').getDOMNode()).attr('disabled','disabled'); {
$j(this.et2.getWidgetById('preview').getDOMNode()).attr('disabled','disabled'); // et2 doesn't understand a disabled button in the normal sense
$j(this.et2.getWidgetById('export').getDOMNode()).attr('disabled','disabled');
$j(this.et2.getWidgetById('preview').getDOMNode()).attr('disabled','disabled');
}
if(!this.et2.getArrayMgr("content").getEntry("filter"))
{
$j('input[value="filter"]').parent().hide();
}
// Disable / hide definition filter if not selected
if(this.et2.getArrayMgr("content").getEntry("selection") != 'filter')
{
$j('div.filters').hide();
}
} }
}, },