Author: fschulze
Date: Wed Nov 16 13:48:02 2005
New Revision: 1835
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:
Renamed style(s) to rule(s).
Modified: azax/trunk/azax/azax.js
==============================================================================
--- azax/trunk/azax/azax.js (original)
+++ azax/trunk/azax/azax.js Wed Nov 16 13:48:02 2005
@@ -18,7 +18,7 @@
}
}
-Azax.setupStyles = function()
+Azax.setupRules = function()
{
nodes = document.getElementsByTagName("link");
for (var i=0;i < nodes.length;i++)
@@ -27,8 +27,8 @@
{
href = nodes[i].href;
preprocessor = new AzaxPreProcessor();
- domdoc = preprocessor.loadStyleSheet(href);
- preprocessor.parseStyleDom(domdoc);
+ domdoc = preprocessor.loadRuleSheet(href);
+ preprocessor.parseRuleDom(domdoc);
preprocessor.setupEvents();
}
}
@@ -37,10 +37,10 @@
// preprocessor
function AzaxPreProcessor() {
- this.styles = new Array();
+ this.rules = new Array();
}
-AzaxPreProcessor.prototype.loadStyleSheet = function(uri)
+AzaxPreProcessor.prototype.loadRuleSheet = function(uri)
{
// Opera doesn't support getDomDocument.load, so we use XMLHttpRequest
domDoc.open("GET", uri, false);
@@ -48,17 +48,25 @@
return domDoc.responseXML;
}
-AzaxPreProcessor.prototype.parseStyleDom = function(domDocument)
+AzaxPreProcessor.prototype.parseRuleDom = function(domDocument)
{
- styles = domDocument.getElementsByTagName("style");
+ var rules = domDocument.getElementsByTagName("rule");
- for (var i=0;i < styles.length;i++)
+ if (domDocument.getElementsByTagName("rules").length != 1) {
+ alert('There are no or more than one "rules" tags'); // TODO change to
saner wording
+ }
+
+ if (rules.length == 0) {
+ alert('There are no rules in the azax file');
+ }
+
+ for (var i=0;i < rules.length;i++)
{
- var style = styles[i];
- var child_nodes = styles[i].childNodes;
+ var rule = rules[i];
+ var child_nodes = rules[i].childNodes;
var selector = "";
- selector = style.getAttribute("selector");
+ selector = rule.getAttribute("selector");
if (selector == null)
selector = "";
@@ -69,7 +77,7 @@
if (event_node.nodeType != 1)
continue;
- var style_type = event_node.tagName;
+ var property_type = event_node.tagName;
var name = event_node.getAttribute("name");
if (name == null)
@@ -77,17 +85,17 @@
var action = event_node.firstChild.nodeValue;
- if (selector != "" && style_type != "" && name != "" && action != "")
+ if (selector != "" && property_type != "" && name != "" && action !=
"")
{
- style = new AzaxStyle(selector, style_type, name, action);
- this.styles[this.styles.length] = style;
+ rule = new AzaxRule(selector, property_type, name, action);
+ this.rules[this.rules.length] = rule;
} else {
if (selector == "")
alert("Selector is empty!");
- else if (style_type == "")
- alert("Type of style is empty!");
+ else if (property_type == "")
+ alert("Type of property is empty!");
else if (name == "")
- alert("Name of style is empty!");
+ alert("Name of rule is empty!");
else if (action == "")
alert("Action is empty!");
}
@@ -96,10 +104,10 @@
}
}
-AzaxStyle = function(selector, style_type, name, action)
+AzaxRule = function(selector, property_type, name, action)
{
this.selector = selector;
- this.style_type = style_type;
+ this.property_type = property_type;
this.name = name;
this.action = action;
}
@@ -107,25 +115,25 @@
AzaxPreProcessor.prototype.setupEvents = function()
{
- styles = this.styles
- for (var y=0;y < styles.length;y++)
+ var rules = this.rules
+ for (var y=0;y < rules.length;y++)
{
- style = styles[y];
- this.setupEvent(style);
+ var rule = rules[y];
+ this.setupEvent(rule);
}
}
-AzaxPreProcessor.prototype.setupEvent = function(style)
+AzaxPreProcessor.prototype.setupEvent = function(rule)
{
- nodes = cssQuery(style.selector);
+ var nodes = cssQuery(rule.selector);
for (var y=0; y < nodes.length; y++)
{
node = nodes[y];
- if (style.style_type == "event") {
- func = function() {Azax.notifyServer(style.action);}
- registerEventListener(node, style.name, func);
+ if (rule.property_type == "event") {
+ var func = function() {Azax.notifyServer(rule.action);}
+ registerEventListener(node, rule.name, func);
} else {
- alert("Unknown style type ("+style.style_type+")!");
+ alert("Unknown property type ("+rule.property_type+")!");
}
}
}
@@ -145,8 +153,8 @@
}
-/* parse and apply azax styles when document is loaded */
-registerEventListener(window, "load", Azax.setupStyles);
+/* parse and apply azax rules when document is loaded */
+registerEventListener(window, "load", Azax.setupRules);
function extractFormsDatas()
{
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 13:48:02 2005
@@ -1,18 +1,18 @@
<?xml version="1.0"?>
-<styles>
- <style selector="button#copyFrom">
+<rules>
+ <rule selector="button#copyFrom">
<event name="click">copyFromDivContent</event>
- </style>
- <style selector="button#copyTo">
+ </rule>
+ <rule selector="button#copyTo">
<event name="click">copyToDivContent</event>
- </style>
- <style selector="button#moveTo">
+ </rule>
+ <rule selector="button#moveTo">
<event name="click">moveToDivContent</event>
- </style>
- <style selector="button#clear">
+ </rule>
+ <rule selector="button#clear">
<event name="click">clearDivContent</event>
- </style>
- <style selector="button#change">
+ </rule>
+ <rule selector="button#change">
<event name="click">getDivContent</event>
- </style>
-</styles>
+ </rule>
+</rules>
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 13:48:02 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<styles>
- <style selector="div#update-area">
+<rules>
+ <rule selector="div#update-area">
<event name="click">getCurrentTime</event>
- </style>
-</styles>
+ </rule>
+</rules>
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
13:48:02 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<styles>
- <style selector="select#first">
+<rules>
+ <rule selector="select#first">
<event name="change">getCorrespondingSelect</event>
- </style>
-</styles>
+ </rule>
+</rules>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
