fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #194 from marcoAntonioNina/BUG-9306

Browse Source 
BUG 9406 The JavaScript function saveAndRedirectForm() saves the...SOLVED
This commit is contained in:
julceslauhub
2012-07-09 09:44:36 -07:00
parent 6322f9f923 47bdb4c61b
commit e0f81d2dfe
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gulliver/js/form/core/form.js
View File

@@ -3054,12 +3054,10 @@ var saveForm = function(oObject) {
**/
var validateURL = function (url){
//var regexp = /https?:\/\/([-\w\.]+)+(:\d+)?(\/([\w/_\.]*(\?\S+)?)?)?/;
if (regexp.test('https?:\/\/([-\w\.]+)+(:\d+)?(\/([\w/_\.]*(\?\S+)?)?)?')){
var regexp = /http?s?:\/\/([-\w\.]+)+(:\d+)?(\/([\w/_\.]*(\?\S+)?)?)?/;
if (regexp.test(url)) {
return true;
}
else
{
} else {
return false;
}
};
@@ -3081,8 +3079,12 @@ var validateURL = function (url){
var saveAndRedirectForm = function(oObject, oLocation) {
saveForm(oObject);
if (validateURL(oLocation)){
document.location.href = oLocation;
if (validateURL(oLocation)) {
if (typeof(parent) != "undefined") {
parent.location.href = oLocation;
} else {
document.location.href = oLocation;
}
}
};