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

Fixed problem with registered data callbacks, when the window the callback belongs to is closed

Browse Source
This commit is contained in:
Andreas Stöckel 2012-03-23 13:39:27 +00:00
parent 00cd1f1e2f
commit eadeb57f28
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -818,6 +818,19 @@ abstract class egw_framework
// add link registry to non-popup windows, if explicit requested (idots_framework::navbar() loads it, if not explicit specified!) // add link registry to non-popup windows, if explicit requested (idots_framework::navbar() loads it, if not explicit specified!)
if ($GLOBALS['egw_info']['flags']['js_link_registry']) if ($GLOBALS['egw_info']['flags']['js_link_registry'])
{ {
$langs = array();
// load translations
translation::add_app('etemplate');
foreach(translation::$loaded_apps as $app => $lang)
{
$langs[] = array(
"app" => $app,
"lang" => $lang
);
}
$java_script .= "egw.langRequire(window, ".json_encode($langs).");\n";
$java_script .= 'egw.set_preferences('.json_encode($GLOBALS['egw_info']['user']['preferences']['common']).', "common");'."\n"; $java_script .= 'egw.set_preferences('.json_encode($GLOBALS['egw_info']['user']['preferences']['common']).', "common");'."\n";
$java_script .= 'egw.set_user('.$GLOBALS['egw']->accounts->json($GLOBALS['egw_info']['user']['account_id']).');'."\n"; $java_script .= 'egw.set_user('.$GLOBALS['egw']->accounts->json($GLOBALS['egw_info']['user']['account_id']).');'."\n";
} }

15
phpgwapi/js/jsapi/egw_data.js
View File

@ -344,12 +344,17 @@ egw.extend("data_storage", egw.MODULE_GLOBAL, function (_app, _wnd) {
// those. // those.
if (typeof registeredCallbacks[_uid] != "undefined") if (typeof registeredCallbacks[_uid] != "undefined")
{ {
for (var i = 0; i < registeredCallbacks[_uid].length; i++) for (var i = registeredCallbacks[_uid].length - 1; i >= 0; i--)
{ {
registeredCallbacks[_uid][i].callback.call( try {
registeredCallbacks[_uid][i].context, registeredCallbacks[_uid][i].callback.call(
_data registeredCallbacks[_uid][i].context,
); _data
);
} catch (e) {
// Remove this callback from the list
registeredCallbacks[_uid].splice(i, 1);
}
} }
} }
}, },