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

prevent some javascript-errors that prevented the correct execution of code

Browse Source
This commit is contained in:
Klaus Leithoff 2015-07-23 11:07:46 +00:00
parent e3fb882eba
commit 23d0108df0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/js/jsapi/app_base.js
View File

@ -776,11 +776,12 @@ var AppJS = Class.extend(
var match_count = 0; var match_count = 0;
for(var state_key in state) for(var state_key in state)
{ {
if(state[state_key] == favorite.state[state_key] || !state[state_key] && !favorite.state[state_key]) if(typeof favorite.state != 'undefined' && typeof state[state_key] != 'undefined'&&typeof favorite.state[state_key] != 'undefined' && ( state[state_key] == favorite.state[state_key] || !state[state_key] && !favorite.state[state_key]))
{ {
match_count++; match_count++;
} }
else if (state[state_key] && typeof state[state_key] === 'object' && favorite.state[state_key] && typeof favorite.state[state_key] === 'object') else if (typeof state[state_key] != 'undefined' && state[state_key] && typeof state[state_key] === 'object'
&& typeof favorite.state != 'undefined' && typeof favorite.state[state_key] != 'undefined' && favorite.state[state_key] && typeof favorite.state[state_key] === 'object')
{ {
if((typeof state[state_key].length !== 'undefined' || typeof state[state_key].length !== 'undefined') if((typeof state[state_key].length !== 'undefined' || typeof state[state_key].length !== 'undefined')
&& (state[state_key].length || Object.keys(state[state_key]).length) != (favorite.state[state_key].length || Object.keys(favorite.state[state_key]).length )) && (state[state_key].length || Object.keys(state[state_key]).length) != (favorite.state[state_key].length || Object.keys(favorite.state[state_key]).length ))
@ -823,7 +824,9 @@ var AppJS = Class.extend(
{ {
// Skip, might be set, might not // Skip, might be set, might not
} }
else if (typeof state[state_key] !== 'undefined' && state[state_key] != favorite.state[state_key]) else if (typeof state[state_key] !== 'undefined'
&& typeof favorite.state != 'undefined'&&typeof favorite.state[state_key] !== 'undefined'
&& state[state_key] != favorite.state[state_key])
{ {
// Different values, do not match // Different values, do not match
return; return;