[mapguide-commits] r4229 - in
trunk/MgDev/Oem/fusionMG/templates/mapguide: aqua limegold
maroon preview slate turquoiseyellow
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Sep 16 17:51:54 EDT 2009
Author: chrisclaydon
Date: 2009-09-16 17:51:53 -0400 (Wed, 16 Sep 2009)
New Revision: 4229
Modified:
trunk/MgDev/Oem/fusionMG/templates/mapguide/aqua/index.html
trunk/MgDev/Oem/fusionMG/templates/mapguide/limegold/index.html
trunk/MgDev/Oem/fusionMG/templates/mapguide/maroon/index.html
trunk/MgDev/Oem/fusionMG/templates/mapguide/preview/index.html
trunk/MgDev/Oem/fusionMG/templates/mapguide/slate/index.html
trunk/MgDev/Oem/fusionMG/templates/mapguide/turquoiseyellow/index.html
Log:
Re #1083 - Submit MGTemplateErrorHandling.patch on behalf of Christine Bao
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/aqua/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/aqua/index.html 2009-09-16 21:41:24 UTC (rev 4228)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/aqua/index.html 2009-09-16 21:51:53 UTC (rev 4229)
@@ -106,18 +106,14 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
- var xmlInvalid = 'xml2json: invalid XML document: ';
- var indexXMLInvalid = errorMessage.indexOf(xmlInvalid);
- if (indexXMLInvalid != -1) {
- var indexStart = indexXMLInvalid + xmlInvalid.length;
- if (indexStart < errorMessage.length) {
- var indexEnd = errorMessage.indexOf(' :', indexStart);
- if (indexEnd != -1) {
- readableMessage = errorMessage.substring(indexStart, indexEnd);
- readableMessage = readableMessage.replace(/\\\\n/g, '\n');
- readableMessage = readableMessage.replace(/\\\\t/g, '\t');
- }
- }
+ var tagStart = '<h2>';
+ var tagEnd = '</h2>';
+ var indexStart = errorMessage.indexOf(tagStart);
+ var indexEnd = errorMessage.indexOf(tagEnd, tagStart);
+ if (indexStart != -1 && indexEnd != -1) {
+ readableMessage = errorMessage.substring(indexStart + tagStart.length, indexEnd);
+ readableMessage = readableMessage.replace(/\\\\n/g, '\n');
+ readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
if (readableMessage != '') {
alert(readableMessage);
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/limegold/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/limegold/index.html 2009-09-16 21:41:24 UTC (rev 4228)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/limegold/index.html 2009-09-16 21:51:53 UTC (rev 4229)
@@ -94,18 +94,14 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
- var xmlInvalid = 'xml2json: invalid XML document: ';
- var indexXMLInvalid = errorMessage.indexOf(xmlInvalid);
- if (indexXMLInvalid != -1) {
- var indexStart = indexXMLInvalid + xmlInvalid.length;
- if (indexStart < errorMessage.length) {
- var indexEnd = errorMessage.indexOf(' :', indexStart);
- if (indexEnd != -1) {
- readableMessage = errorMessage.substring(indexStart, indexEnd);
- readableMessage = readableMessage.replace(/\\\\n/g, '\n');
- readableMessage = readableMessage.replace(/\\\\t/g, '\t');
- }
- }
+ var tagStart = '<h2>';
+ var tagEnd = '</h2>';
+ var indexStart = errorMessage.indexOf(tagStart);
+ var indexEnd = errorMessage.indexOf(tagEnd, tagStart);
+ if (indexStart != -1 && indexEnd != -1) {
+ readableMessage = errorMessage.substring(indexStart + tagStart.length, indexEnd);
+ readableMessage = readableMessage.replace(/\\\\n/g, '\n');
+ readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
if (readableMessage != '') {
alert(readableMessage);
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/maroon/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/maroon/index.html 2009-09-16 21:41:24 UTC (rev 4228)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/maroon/index.html 2009-09-16 21:51:53 UTC (rev 4229)
@@ -117,18 +117,14 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
- var xmlInvalid = 'xml2json: invalid XML document: ';
- var indexXMLInvalid = errorMessage.indexOf(xmlInvalid);
- if (indexXMLInvalid != -1) {
- var indexStart = indexXMLInvalid + xmlInvalid.length;
- if (indexStart < errorMessage.length) {
- var indexEnd = errorMessage.indexOf(' :', indexStart);
- if (indexEnd != -1) {
- readableMessage = errorMessage.substring(indexStart, indexEnd);
- readableMessage = readableMessage.replace(/\\\\n/g, '\n');
- readableMessage = readableMessage.replace(/\\\\t/g, '\t');
- }
- }
+ var tagStart = '<h2>';
+ var tagEnd = '</h2>';
+ var indexStart = errorMessage.indexOf(tagStart);
+ var indexEnd = errorMessage.indexOf(tagEnd, tagStart);
+ if (indexStart != -1 && indexEnd != -1) {
+ readableMessage = errorMessage.substring(indexStart + tagStart.length, indexEnd);
+ readableMessage = readableMessage.replace(/\\\\n/g, '\n');
+ readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
if (readableMessage != '') {
alert(readableMessage);
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/preview/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/preview/index.html 2009-09-16 21:41:24 UTC (rev 4228)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/preview/index.html 2009-09-16 21:51:53 UTC (rev 4229)
@@ -93,18 +93,14 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
- var xmlInvalid = 'xml2json: invalid XML document: ';
- var indexXMLInvalid = errorMessage.indexOf(xmlInvalid);
- if (indexXMLInvalid != -1) {
- var indexStart = indexXMLInvalid + xmlInvalid.length;
- if (indexStart < errorMessage.length) {
- var indexEnd = errorMessage.indexOf(' :', indexStart);
- if (indexEnd != -1) {
- readableMessage = errorMessage.substring(indexStart, indexEnd);
- readableMessage = readableMessage.replace(/\\\\n/g, '\n');
- readableMessage = readableMessage.replace(/\\\\t/g, '\t');
- }
- }
+ var tagStart = '<h2>';
+ var tagEnd = '</h2>';
+ var indexStart = errorMessage.indexOf(tagStart);
+ var indexEnd = errorMessage.indexOf(tagEnd, tagStart);
+ if (indexStart != -1 && indexEnd != -1) {
+ readableMessage = errorMessage.substring(indexStart + tagStart.length, indexEnd);
+ readableMessage = readableMessage.replace(/\\\\n/g, '\n');
+ readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
if (readableMessage != '') {
alert(readableMessage);
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/slate/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/slate/index.html 2009-09-16 21:41:24 UTC (rev 4228)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/slate/index.html 2009-09-16 21:51:53 UTC (rev 4229)
@@ -98,18 +98,14 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
- var xmlInvalid = 'xml2json: invalid XML document: ';
- var indexXMLInvalid = errorMessage.indexOf(xmlInvalid);
- if (indexXMLInvalid != -1) {
- var indexStart = indexXMLInvalid + xmlInvalid.length;
- if (indexStart < errorMessage.length) {
- var indexEnd = errorMessage.indexOf(' :', indexStart);
- if (indexEnd != -1) {
- readableMessage = errorMessage.substring(indexStart, indexEnd);
- readableMessage = readableMessage.replace(/\\\\n/g, '\n');
- readableMessage = readableMessage.replace(/\\\\t/g, '\t');
- }
- }
+ var tagStart = '<h2>';
+ var tagEnd = '</h2>';
+ var indexStart = errorMessage.indexOf(tagStart);
+ var indexEnd = errorMessage.indexOf(tagEnd, tagStart);
+ if (indexStart != -1 && indexEnd != -1) {
+ readableMessage = errorMessage.substring(indexStart + tagStart.length, indexEnd);
+ readableMessage = readableMessage.replace(/\\\\n/g, '\n');
+ readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
if (readableMessage != '') {
alert(readableMessage);
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/turquoiseyellow/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/turquoiseyellow/index.html 2009-09-16 21:41:24 UTC (rev 4228)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/turquoiseyellow/index.html 2009-09-16 21:51:53 UTC (rev 4229)
@@ -82,18 +82,14 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
- var xmlInvalid = 'xml2json: invalid XML document: ';
- var indexXMLInvalid = errorMessage.indexOf(xmlInvalid);
- if (indexXMLInvalid != -1) {
- var indexStart = indexXMLInvalid + xmlInvalid.length;
- if (indexStart < errorMessage.length) {
- var indexEnd = errorMessage.indexOf(' :', indexStart);
- if (indexEnd != -1) {
- readableMessage = errorMessage.substring(indexStart, indexEnd);
- readableMessage = readableMessage.replace(/\\\\n/g, '\n');
- readableMessage = readableMessage.replace(/\\\\t/g, '\t');
- }
- }
+ var tagStart = '<h2>';
+ var tagEnd = '</h2>';
+ var indexStart = errorMessage.indexOf(tagStart);
+ var indexEnd = errorMessage.indexOf(tagEnd, tagStart);
+ if (indexStart != -1 && indexEnd != -1) {
+ readableMessage = errorMessage.substring(indexStart + tagStart.length, indexEnd);
+ readableMessage = readableMessage.replace(/\\\\n/g, '\n');
+ readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
if (readableMessage != '') {
alert(readableMessage);
More information about the mapguide-commits
mailing list