holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Included dhtmlx js files in egw_menu_dhtmlx.js, fixed problem with removing action objects, improved egw_include_mgr a bit

Browse Source
This commit is contained in:
Andreas Stöckel 2011-09-09 14:03:18 +00:00
parent e998a1fed5
commit 50ad9e4ba0
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
phpgwapi/inc/class.egw_include_mgr.inc.php
View File

@ -189,19 +189,26 @@ class egw_include_mgr
// base file // base file
if (count($entry) == 1) if (count($entry) == 1)
{ {
// Assemble a filename if ($entry[0][0] == "/")
$filename = dirname($path).'/'.$entry[0].'.js';
if (is_readable(EGW_SERVER_ROOT.($filename)))
{ {
if (!$this->file_processed($filename)) $uses_path = $this->translate_params($entry[0], null, '');
{
$uses_path = $filename;
}
} }
else else
{ {
$uses_path = $this->translate_params($entry[0], null, 'phpgwapi'); // Assemble a filename
$filename = dirname($path).'/'.$entry[0].'.js';
if (is_readable(EGW_SERVER_ROOT.($filename)))
{
if (!$this->file_processed($filename))
{
$uses_path = $filename;
}
}
else
{
$uses_path = $this->translate_params($entry[0], null, 'phpgwapi');
}
} }
} }
else if (count($entry) == 2) else if (count($entry) == 2)
@ -267,7 +274,8 @@ class egw_include_mgr
*/ */
private function translate_params($package, $file, $app) private function translate_params($package, $file, $app)
{ {
if ($package[0] == '/' && is_readable(EGW_SERVER_ROOT.(parse_url($path = $package, PHP_URL_PATH))) || if ($package[0] == '/' && (is_readable(EGW_SERVER_ROOT.(parse_url($path = $package, PHP_URL_PATH))) ||
is_readable(EGW_SERVER_ROOT.($path = $package))) ||
is_readable(EGW_SERVER_ROOT.($path="/$app/js/$package/$file.js")) || is_readable(EGW_SERVER_ROOT.($path="/$app/js/$package/$file.js")) ||
$app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path="/phpgwapi/js/$package/$file.js"))) $app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path="/phpgwapi/js/$package/$file.js")))
{ {

5
phpgwapi/js/egw_action/egw_action.js
View File

@ -879,7 +879,10 @@ egwActionObject.prototype.remove = function() {
{ {
var idx = this.parent.children.indexOf(this); var idx = this.parent.children.indexOf(this);
this.parent.children.splice(idx, 1); if (idx >= 0)
{
this.parent.children.splice(idx, 1);
}
} }
} }

3
phpgwapi/js/egw_action/egw_menu_dhtmlx.js
View File

@ -11,6 +11,9 @@
/*egw:uses /*egw:uses
egw_menu; egw_menu;
/phpgwapi/js/dhtmlxtree/dhtmlxMenu/codebase/dhtmlxmenu.js;
/phpgwapi/js/dhtmlxtree/dhtmlxMenu/codebase/ext/dhtmlxmenu_ext.js;
/phpgwapi/js/dhtmlxtree/dhtmlxMenu/codebase/dhtmlxcommon.js;
*/ */
function egwMenuImpl(_structure) function egwMenuImpl(_structure)