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

fix en translation is always used for common, caused by preferences had a stub default preference for common AND egw.includeJS immediatly called callback for a file just sheduled to be loaded, but not yet arrived

Browse Source
This commit is contained in:
Ralf Becker 2014-01-15 17:39:07 +00:00
parent b56175a0f4
commit 53c6059d84
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/js/jsapi/egw_files.js
View File

@ -164,10 +164,12 @@ egw.extend('files', egw.MODULE_WND_LOCAL, function(_app, _wnd)
i--; // as index will be incr by for! i--; // as index will be incr by for!
} }
} }
// check if all files already included --> call callback right away // check if all files already included or sheduled to be included --> call callback via egw_LAB.wait
if (!_jsFiles.length) if (!_jsFiles.length)
{ {
_callback.call(_context); egw_LAB.wait(function(){
_callback.call(_context);
});
return; return;
} }

8
phpgwapi/js/jsapi/egw_preferences.js
View File

@ -24,13 +24,7 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function() {
* *
* @access: private, use egw.preferences() or egw.set_perferences() * @access: private, use egw.preferences() or egw.set_perferences()
*/ */
var prefs = { var prefs = {};
common: {
dateformat: "Y-m-d",
timeformat: 24,
lang: "en"
}
};
// Return the actual extension // Return the actual extension
return { return {