Author: simoneg
Date: Thu Jan 20 11:58:41 2011
New Revision: 1061251
URL: http://svn.apache.org/viewvc?rev=1061251&view=rev
Log:
Fix on "others" being asked also when there are no others, empty others being
considered the home page, missing block causing a complete failure of parsing
Modified:
labs/magma/trunk/website-autoajax/src/main/java/org/apache/magma/website/autoajax/AjaxBuInternalDispatch.aj
labs/magma/trunk/website-autoajax/src/main/resources/org/apache/magma/website/autoajax/autoajax.js
Modified:
labs/magma/trunk/website-autoajax/src/main/java/org/apache/magma/website/autoajax/AjaxBuInternalDispatch.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-autoajax/src/main/java/org/apache/magma/website/autoajax/AjaxBuInternalDispatch.aj?rev=1061251&r1=1061250&r2=1061251&view=diff
==============================================================================
---
labs/magma/trunk/website-autoajax/src/main/java/org/apache/magma/website/autoajax/AjaxBuInternalDispatch.aj
(original)
+++
labs/magma/trunk/website-autoajax/src/main/java/org/apache/magma/website/autoajax/AjaxBuInternalDispatch.aj
Thu Jan 20 11:58:41 2011
@@ -37,7 +37,7 @@ public privileged aspect AjaxBuInternalD
if (producer instanceof HtmlProducer)
producers.add((HtmlProducer)producer);
String othersStr = req.getParameter("others");
- if (othersStr != null) {
+ if (othersStr != null && othersStr.length() > 0) {
String[] othsplit = othersStr.split(";");
for (String oth : othsplit) {
oth = URLDecoder.decode(oth,"UTF-8");
Modified:
labs/magma/trunk/website-autoajax/src/main/resources/org/apache/magma/website/autoajax/autoajax.js
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-autoajax/src/main/resources/org/apache/magma/website/autoajax/autoajax.js?rev=1061251&r1=1061250&r2=1061251&view=diff
==============================================================================
---
labs/magma/trunk/website-autoajax/src/main/resources/org/apache/magma/website/autoajax/autoajax.js
(original)
+++
labs/magma/trunk/website-autoajax/src/main/resources/org/apache/magma/website/autoajax/autoajax.js
Thu Jan 20 11:58:41 2011
@@ -217,7 +217,7 @@ magma.autoajax = new function() {
setTimeout('magma.autoajax._intrenew()', 200);
var stategrp = this.state.elements[stateId];
- if (stategrp.type == 'int') {
+ if (stategrp && stategrp.type == 'int') {
var mainurl = stategrp.localurl;
var jqele = jQuery(stategrp.domElement);
var event = jQuery.Event("renewing");
@@ -237,14 +237,19 @@ magma.autoajax = new function() {
me.torenew.splice(i,1);
i--;
}
- }
+ }
+
+ var others = {};
+ if (urls.length > 0) {
+ others = {"others" : urls.join(';')};
+ }
/* Since they are internals, we can use the batched
version */
jQuery.ajax({
url: me._buildUrl(mainurl,".ajaxbuint"),
type: "POST",
dataType: "html",
- data: {"others" : urls.join(';')},
+ data: others,
complete: me.parseResponse
});
return;
@@ -290,6 +295,10 @@ magma.autoajax = new function() {
*/
this.performRemove = function(stateId) {
var stategrp = this.state.elements[stateId];
+ if (!stategrp) {
+ console.log("Stategroup (id,grp) is undefined ",
stateId, stategrp);
+ return;
+ }
var jqele = jQuery(stategrp.domElement);
var event = jQuery.Event("removing");
event.state = stategrp;
@@ -309,6 +318,10 @@ magma.autoajax = new function() {
this.performAdd = function(position, relative, what) {
var stategrp = this.state.elements[relative];
+ if (!stategrp) {
+ console.log("Stategroup (id,grp) is undefined ",
relative, stategrp);
+ return;
+ }
var jqele = jQuery(stategrp.domElement);
var payload = $(what).children();
var event = jQuery.Event("adding");
@@ -330,6 +343,11 @@ magma.autoajax = new function() {
this.performRenew = function(which, what) {
var stategrp = this.state.elements[which];
+ if (!stategrp) {
+ console.log("Stategroup (id,grp) is undefined ", which,
stategrp);
+ return;
+ }
+
var jqele = jQuery(stategrp.domElement);
var payload = $(what).children();
jqele.empty();
@@ -358,9 +376,14 @@ magma.autoajax = new function() {
this.performMove = function(id1, relation, id2) {
var stategrp1 = this.state.elements[id1];
- var jqele1 = jQuery(stategrp1.domElement);
-
var stategrp2 = this.state.elements[id2];
+
+ if (!stategrp1 || !stategrp2) {
+ console.log("One of stategroups (id1,1,id2,2) is
undefined ", id1, stategrp1, id2, stategrp2);
+ return;
+ }
+
+ var jqele1 = jQuery(stategrp1.domElement);
var jqele2 = jQuery(stategrp2.domElement);
var event = jQuery.Event("moving");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
