You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/05/31 03:25:22 UTC
svn commit: r410415 - in
/tapestry/tapestry4/trunk/framework/src/js/tapestry: core.js html.js
Author: jkuhnert
Date: Tue May 30 18:25:21 2006
New Revision: 410415
URL: http://svn.apache.org/viewvc?rev=410415&view=rev
Log:
refactoring for cleaner code
Added:
tapestry/tapestry4/trunk/framework/src/js/tapestry/html.js (with props)
Modified:
tapestry/tapestry4/trunk/framework/src/js/tapestry/core.js
Modified: tapestry/tapestry4/trunk/framework/src/js/tapestry/core.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/js/tapestry/core.js?rev=410415&r1=410414&r2=410415&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/js/tapestry/core.js (original)
+++ tapestry/tapestry4/trunk/framework/src/js/tapestry/core.js Tue May 30 18:25:21 2006
@@ -48,6 +48,7 @@
*/
load:function(type, data, http, kwArgs){
dojo.log.debug("Response recieved.");
+ dojo.require("tapestry.html");
var resp=data.getElementsByTagName("ajax-response");
if (!resp || resp.length < 1 || !resp[0].childNodes) { dojo.log.warn("No ajax-response elements recieved."); return; }
@@ -57,86 +58,9 @@
var type=elms[i].getAttribute("type");
if (type == "exception") {
- tapestry.presentException(elms[i], kwArgs);
+ tapestry.html.presentException(elms[i], kwArgs);
return;
}
}
- },
-
- presentException:function(node, kwArgs) {
- var excnode=document.createElement("div");
- excnode.setAttribute("id", "exceptiondialog");
- document.body.appendChild(excnode);
-
- var contentnode=document.createElement("div");
- contentnode.innerHTML=this.getContentAsString(node);
- dojo.html.setClass(contentnode, "exceptionDialog");
-
- var navnode=document.createElement("div");
- navnode.setAttribute("id", "exceptionDialogHandle");
- dojo.html.setClass(navnode, "exceptionCloseLink");
- navnode.appendChild(document.createTextNode("Close"));
-
- excnode.appendChild(navnode);
- excnode.appendChild(contentnode);
-
- var dialog=dojo.widget.createWidget("Dialog", {widgetId:"exception"}, excnode);
-
- dojo.event.connect(navnode, "onclick", dialog, "hide");
- dojo.event.connect(dialog, "hide", function(e) {
- dojo.widget.byId("exception").destroy();
- var node=dojo.byId("exceptiondialog");
- if (node) dojo.dom.removeNode(node);
- });
-
- dialog.show();
- },
-
- getContentAsString:function(node){
- if (typeof node.xml != "undefined")
- return this.getContentAsStringIE(node);
- else if (typeof XMLSerializer != "undefined" )
- return this.getContentAsStringMozilla(node);
- else
- return this.getContentAsStringGeneric(node);
- },
-
- getContentAsStringIE:function(node){
- var s="";
- for (var i = 0; i < node.childNodes.length; i++)
- s += node.childNodes[i].xml;
- return s;
- },
-
- getContentAsStringMozilla:function(node){
- var xmlSerializer = new XMLSerializer();
- var s = "";
- for (var i = 0; i < node.childNodes.length; i++) {
- s += xmlSerializer.serializeToString(node.childNodes[i]);
- if (s == "undefined")
- return this.getContentAsStringGeneric(node);
- }
- return s;
- },
-
- getContentAsStringGeneric:function(node){
- var s="";
- if (node == null) { return s; }
- for (var i = 0; i < node.childNodes.length; i++) {
- switch (node.childNodes[i].nodeType) {
- case 1: // ELEMENT_NODE
- case 5: // ENTITY_REFERENCE_NODE
- s += tacos.getElementAsStringGeneric(node.childNodes[i]);
- break;
- case 3: // TEXT_NODE
- case 2: // ATTRIBUTE_NODE
- case 4: // CDATA_SECTION_NODE
- s += node.childNodes[i].nodeValue;
- break;
- default:
- break;
- }
- }
- return s;
}
}
Added: tapestry/tapestry4/trunk/framework/src/js/tapestry/html.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/js/tapestry/html.js?rev=410415&view=auto
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/js/tapestry/html.js (added)
+++ tapestry/tapestry4/trunk/framework/src/js/tapestry/html.js Tue May 30 18:25:21 2006
@@ -0,0 +1,86 @@
+dojo.provide("tapestry.event");
+
+dojo.require("dojo.event");
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.Dialog");
+dojo.require("dojo.html");
+
+tapestry.html={
+
+ presentException:function(node, kwArgs) {
+ var excnode=document.createElement("div");
+ excnode.setAttribute("id", "exceptiondialog");
+ document.body.appendChild(excnode);
+
+ var contentnode=document.createElement("div");
+ contentnode.innerHTML=this.getContentAsString(node);
+ dojo.html.setClass(contentnode, "exceptionDialog");
+
+ var navnode=document.createElement("div");
+ navnode.setAttribute("id", "exceptionDialogHandle");
+ dojo.html.setClass(navnode, "exceptionCloseLink");
+ navnode.appendChild(document.createTextNode("Close"));
+
+ excnode.appendChild(navnode);
+ excnode.appendChild(contentnode);
+
+ var dialog=dojo.widget.createWidget("Dialog", {widgetId:"exception"}, excnode);
+
+ dojo.event.cnnect(navnode, "onclick", dialog, "hide");
+ dojo.event.connect(dialog, "hide", function(e) {
+ dojo.widget.byId("exception").destroy();
+ var node=dojo.byId("exceptiondialog");
+ if (node) dojo.dom.removeNode(node);
+ });
+
+ dialog.show();
+ },
+
+ getContentAsString:function(node){
+ if (typeof node.xml != "undefined")
+ return this.getContentAsStringIE(node);
+ else if (typeof XMLSerializer != "undefined" )
+ return this.getContentAsStringMozilla(node);
+ else
+ return this.getContentAsStringGeneric(node);
+ },
+
+ getContentAsStringIE:function(node){
+ var s="";
+ for (var i = 0; i < node.childNodes.length; i++)
+ s += node.childNodes[i].xml;
+ return s;
+ },
+
+ getContentAsStringMozilla:function(node){
+ var xmlSerializer = new XMLSerializer();
+ var s = "";
+ for (var i = 0; i < node.childNodes.length; i++) {
+ s += xmlSerializer.serializeToString(node.childNodes[i]);
+ if (s == "undefined")
+ return this.getContentAsStringGeneric(node);
+ }
+ return s;
+ },
+
+ getContentAsStringGeneric:function(node){
+ var s="";
+ if (node == null) { return s; }
+ for (var i = 0; i < node.childNodes.length; i++) {
+ switch (node.childNodes[i].nodeType) {
+ case 1: // ELEMENT_NODE
+ case 5: // ENTITY_REFERENCE_NODE
+ s += tacos.getElementAsStringGeneric(node.childNodes[i]);
+ break;
+ case 3: // TEXT_NODE
+ case 2: // ATTRIBUTE_NODE
+ case 4: // CDATA_SECTION_NODE
+ s += node.childNodes[i].nodeValue;
+ break;
+ default:
+ break;
+ }
+ }
+ return s;
+ }
+}
\ No newline at end of file
Propchange: tapestry/tapestry4/trunk/framework/src/js/tapestry/html.js
------------------------------------------------------------------------------
svn:eol-style = native