Merge pull request #891 from rasika/master

Geo fencing improvements : Error Messages not shown
4.x.x
Madawa Soysa 7 years ago committed by GitHub
commit 3e13588554

@ -264,6 +264,7 @@ function setWithinAlert(leafletId) {
} else { } else {
var ptrn = /(?:<am\:description>)(.*)(?:<\/am\:description>)/g; var ptrn = /(?:<am\:description>)(.*)(?:<\/am\:description>)/g;
var errorTxt; var errorTxt;
var result = (ptrn.exec(data));
if (result) { if (result) {
errorTxt = result.length > 1 ? result[1] : data; errorTxt = result.length > 1 ? result[1] : data;
} else { } else {
@ -320,6 +321,7 @@ function setExitAlert(leafletId) {
} else { } else {
var ptrn = /(?:<am\:description>)(.*)(?:<\/am\:description>)/g; var ptrn = /(?:<am\:description>)(.*)(?:<\/am\:description>)/g;
var errorTxt; var errorTxt;
var result = (ptrn.exec(data));
if (result) { if (result) {
errorTxt = result.length > 1 ? result[1] : data; errorTxt = result.length > 1 ? result[1] : data;
} else { } else {
@ -391,6 +393,7 @@ function setStationeryAlert(leafletId) {
} else { } else {
var ptrn = /(?:<am\:description>)(.*)(?:<\/am\:description>)/g; var ptrn = /(?:<am\:description>)(.*)(?:<\/am\:description>)/g;
var errorTxt; var errorTxt;
var result = (ptrn.exec(data));
if (result) { if (result) {
errorTxt = result.length > 1 ? result[1] : data; errorTxt = result.length > 1 ? result[1] : data;
} else { } else {
@ -499,6 +502,7 @@ function setTrafficAlert(leafletId) {
} else { } else {
var ptrn = /(?:<am\:description>)(.*)(?:<\/am\:description>)/g; var ptrn = /(?:<am\:description>)(.*)(?:<\/am\:description>)/g;
var errorTxt; var errorTxt;
var result = (ptrn.exec(data));
if (result) { if (result) {
errorTxt = result.length > 1 ? result[1] : data; errorTxt = result.length > 1 ? result[1] : data;
} else { } else {
@ -603,6 +607,7 @@ function setProximityAlert() {
} else { } else {
var ptrn = /(?:<am\:description>)(.*)(?:<\/am\:description>)/g; var ptrn = /(?:<am\:description>)(.*)(?:<\/am\:description>)/g;
var errorTxt; var errorTxt;
var result = (ptrn.exec(data));
if (result) { if (result) {
errorTxt = result.length > 1 ? result[1] : data; errorTxt = result.length > 1 ? result[1] : data;
} else { } else {

Loading…
Cancel
Save