Author: reto
Date: Mon Mar 1 13:40:11 2010
New Revision: 917522
URL: http://svn.apache.org/viewvc?rev=917522&view=rev
Log:
CLEREZZA-47: support to work with elements and jqueryx selections
Modified:
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/
(props changed)
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/ajax-options.js
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/alert-message.js
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/overlay.js
Propchange:
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 1 13:40:11 2010
@@ -0,0 +1,2 @@
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts:916331-917432
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.web.resources.scripts:892743-916330
Modified:
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/ajax-options.js
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/ajax-options.js?rev=917522&r1=917521&r2=917522&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/ajax-options.js
(original)
+++
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/ajax-options.js
Mon Mar 1 13:40:11 2010
@@ -57,6 +57,26 @@
AjaxOptions.prototype.errorAction = function() {};
AjaxOptions.prototype.error = function(XMLHttpRequest, textStatus,
errorThrown) {
this.errorAction();
- AlertMessage.show(function(){}, "The following error occured: " +
textStatus, "Error", "Ok");
+ var errorMessage = XMLHttpRequest.responseText;
+ if(errorMessage == undefined || errorMessage == "") {
+ errorMessage = "Unspecified Error (" + textStatus + ")";
+ }
+ try {
+ var errorXml = XMLHttpRequest.responseXML
+ } catch (err) {
+ }
+ if (!errorXml) {
+ errorXml = $(errorMessage)[0]
+ }
+ if (errorXml) {
+ try {
+ var errorMessageFromXml = $('body',errorXml).text()
+ } catch (err) {
+ }
+ }
+ if (errorMessageFromXml) {
+ errorMessage = errorMessageFromXml
+ }
+ AlertMessage.show(function(){}, "The following error occured: " +
errorMessage, "Error", "Ok");
statusMessage.remove(this.actionName);
};
Modified:
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/alert-message.js
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/alert-message.js?rev=917522&r1=917521&r2=917522&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/alert-message.js
(original)
+++
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/alert-message.js
Mon Mar 1 13:40:11 2010
@@ -28,7 +28,7 @@
/**
* Creates and renders a dialox box.
*
- * @param doFunction is a callback function which fired if accept button is
pressed
+ * @param doFunction is a callback function which fired when the yes button is
pressed
* @param message
* @param headerText
* @param textYes
@@ -36,7 +36,7 @@
*
*
*/
-AlertMessage.show = function(doFunction, message, headerText, textYes, textNo)
{
+AlertMessage.show = function(handleYesFunction, message, headerText, textYes,
textNo) {
var handleYes = function() {
doFunction();
this.destroy();
@@ -83,7 +83,7 @@
draggable: false,
close: true,
modal: true,
- zIndex: 1000,
+ zIndex: 100000,
text: message,
constraintoviewport: true,
Modified:
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/overlay.js
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/overlay.js?rev=917522&r1=917521&r2=917522&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/overlay.js
(original)
+++
incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts/src/main/resources/org/apache/clerezza/web/resources/scripts/staticweb/overlay.js
Mon Mar 1 13:40:11 2010
@@ -51,7 +51,7 @@
heightOverlay = "37em";
}
- this.overlay = new YAHOO.widget.Panel("tx-assetsdetail", {
+ this.overlay = new YAHOO.widget.Panel("tx-overlay", {
draggable: true,
width: widthOverlay,
height: heightOverlay,
@@ -65,9 +65,13 @@
});
if (body.length) {
- this.overlay.setBody(body);
+ if (!body.substring) {
+ //as with results from jquery $-fucntion
+ body = body[0]
+ }
}
-
+
+ this.overlay.setBody(body);
if (header.length) {
this.overlay.setHeader(header);
}
