extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-25 14:41:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved invalde type handling

Browse Source
This commit is contained in:
Andreas Stöckel 2011-08-16 13:45:41 +00:00
parent 786ec9220c
commit fef5ad8ebd
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
etemplate/js/et2_common.js
View File

@ -97,10 +97,21 @@ function et2_evalBool(_val)
* into the corresponding type. The (converted) value is returned. All supported * into the corresponding type. The (converted) value is returned. All supported
* types are listed in the et2_validTypes array. * types are listed in the et2_validTypes array.
*/ */
function et2_checkType(_val, _type) function et2_checkType(_val, _type, _attr)
{ {
if (typeof _attr == "undefined")
{
_attr = null;
}
function _err() { function _err() {
throw("'" + _val + "' is not of specified _type '" + _type + "'"); var res = et2_typeDefaults[_type];
et2_debug("warn", "'" + _val + "' was not of specified _type '" +
_type + (_attr != null ? "' for attribute '" + _attr + "' " : "") +
"and is now '" + res + "'");
return res;
} }
// If the type is "any" simply return the value again // If the type is "any" simply return the value again
@ -124,7 +135,7 @@ function et2_checkType(_val, _type)
return _val === "true"; return _val === "true";
} }
_err(); return _err();
} }
if (_type == "js") if (_type == "js")
@ -147,7 +158,7 @@ function et2_checkType(_val, _type)
return null; return null;
} }
_err(); return _err();
} }
// Check whether the given value is of the type "string" // Check whether the given value is of the type "string"
@ -158,7 +169,7 @@ function et2_checkType(_val, _type)
return _val; return _val;
} }
_err(); return _err();
} }
// Check whether the value is already a number, otherwise try to convert it // Check whether the value is already a number, otherwise try to convert it
@ -175,7 +186,7 @@ function et2_checkType(_val, _type)
return parseFloat(_val); return parseFloat(_val);
} }
_err(); return _err();
} }
// Check whether the value is an integer by comparing the result of // Check whether the value is an integer by comparing the result of
@ -187,7 +198,7 @@ function et2_checkType(_val, _type)
return parseInt(_val); return parseInt(_val);
} }
_err(); return _err();
} }
// We should never come here // We should never come here

3
etemplate/js/et2_inheritance.js
View File

@ -334,7 +334,8 @@
_override = true; _override = true;
} }
var val = et2_checkType(_value, this.attributes[_name].type); var val = et2_checkType(_value, this.attributes[_name].type,
_name);
if (typeof this["set_" + _name] == "function") if (typeof this["set_" + _name] == "function")
{ {