Author: fschulze
Date: Wed Nov 16 11:30:36 2005
New Revision: 1831
Modified:
azax/trunk/azax/azax.js
azax/trunk/demos/azaxdemo/browser/azax_demo.azax
azax/trunk/demos/azaxdemo/browser/azax_three_autoupdate.azax
azax/trunk/demos/azaxdemo/browser/azax_two_select.azax
Log:
Changed syntax of azax files.
Modified: azax/trunk/azax/azax.js
==============================================================================
--- azax/trunk/azax/azax.js (original)
+++ azax/trunk/azax/azax.js Wed Nov 16 11:30:36 2005
@@ -55,33 +55,35 @@
for (var i=0;i < styles.length;i++)
{
var style = styles[i];
- var childNodes = styles[i].childNodes;
- selector = "";
- event_ = "";
- action = "";
-
- selectorNodes = style.getElementsByTagName("selector");
- if (selectorNodes.length == 1 && selectorNodes[0].childNodes.length != 0)
- {
- selector = selectorNodes[0].firstChild.nodeValue;
+ var child_nodes = styles[i].childNodes;
+ var selector = "";
+ var event_ = "";
+ var action = "";
+
+ selector = style.getAttribute("selector");
+ if (selector == null)
+ selector = "";
+
+ var event_nodes = style.getElementsByTagName("event");
+ for (var event_index=0; event_index < event_nodes.length; event_index++) {
+ var event_node = event_nodes[event_index];
+ event_ = event_node.getAttribute("name");
+ if (event_ == null)
+ event_ = "";
+ action = event_node.firstChild.nodeValue;
}
- eventNodes = style.getElementsByTagName("event");
- if (eventNodes.length == 1 && eventNodes[0].childNodes.length != 0)
- {
- event_ = eventNodes[0].firstChild.nodeValue;
- }
-
- actionNodes = style.getElementsByTagName("action");
- if (actionNodes.length == 1 && actionNodes[0].childNodes.length != 0)
- {
- action = actionNodes[0].firstChild.nodeValue;
- }
-
if (selector != "" && event_ != "" && action != "")
{
style = new AzaxStyle(selector, event_, action);
this.styles[this.styles.length] = style;
+ } else {
+ if (selector == "")
+ alert("Selector is empty!");
+ else if (event_ == "")
+ alert("Event is empty!");
+ else if (action == "")
+ alert("Action is empty!");
}
}
}
Modified: azax/trunk/demos/azaxdemo/browser/azax_demo.azax
==============================================================================
--- azax/trunk/demos/azaxdemo/browser/azax_demo.azax (original)
+++ azax/trunk/demos/azaxdemo/browser/azax_demo.azax Wed Nov 16 11:30:36 2005
@@ -1,28 +1,18 @@
<?xml version="1.0"?>
<styles>
- <style>
- <selector>button#copyFrom</selector>
- <event>click</event>
- <action>copyFromDivContent</action>
+ <style selector="button#copyFrom">
+ <event name="click">copyFromDivContent</event>
</style>
- <style>
- <selector>button#copyTo</selector>
- <event>click</event>
- <action>copyToDivContent</action>
+ <style selector="button#copyTo">
+ <event name="click">copyToDivContent</event>
</style>
- <style>
- <selector>button#moveTo</selector>
- <event>click</event>
- <action>moveToDivContent</action>
+ <style selector="button#moveTo">
+ <event name="click">moveToDivContent</event>
</style>
- <style>
- <selector>button#clear</selector>
- <event>click</event>
- <action>clearDivContent</action>
+ <style selector="button#clear">
+ <event name="click">clearDivContent</event>
</style>
- <style>
- <selector>button#change</selector>
- <event>click</event>
- <action>getDivContent</action>
+ <style selector="button#change">
+ <event name="click">getDivContent</event>
</style>
</styles>
Modified: azax/trunk/demos/azaxdemo/browser/azax_three_autoupdate.azax
==============================================================================
--- azax/trunk/demos/azaxdemo/browser/azax_three_autoupdate.azax
(original)
+++ azax/trunk/demos/azaxdemo/browser/azax_three_autoupdate.azax Wed Nov
16 11:30:36 2005
@@ -1,8 +1,6 @@
<?xml version="1.0"?>
<styles>
- <style>
- <selector>div#update-area</selector>
- <event>click</event>
- <action>getCurrentTime</action>
+ <style selector="div#update-area">
+ <event name="click">getCurrentTime</event>
</style>
</styles>
Modified: azax/trunk/demos/azaxdemo/browser/azax_two_select.azax
==============================================================================
--- azax/trunk/demos/azaxdemo/browser/azax_two_select.azax (original)
+++ azax/trunk/demos/azaxdemo/browser/azax_two_select.azax Wed Nov 16
11:30:36 2005
@@ -1,8 +1,6 @@
<?xml version="1.0"?>
<styles>
- <style>
- <selector>select#first</selector>
- <event>change</event>
- <action>getCorrespondingSelect</action>
+ <style selector="select#first">
+ <event name="change">getCorrespondingSelect</event>
</style>
</styles>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
