Author: gotcha
Date: Mon Dec 24 12:38:56 2007
New Revision: 50059
Modified:
kukit/kukit.js/branch/finish-closures/kukit/TODO.txt
kukit/kukit.js/branch/finish-closures/kukit/oper.js
Log:
unindent and initialize
Modified: kukit/kukit.js/branch/finish-closures/kukit/TODO.txt
==============================================================================
--- kukit/kukit.js/branch/finish-closures/kukit/TODO.txt (original)
+++ kukit/kukit.js/branch/finish-closures/kukit/TODO.txt Mon Dec 24
12:38:56 2007
@@ -7,7 +7,6 @@
eventreg.js
forms.js
kssparser.js
-oper.js
providerreg.js
selectorreg.js
tokenizer.js
Modified: kukit/kukit.js/branch/finish-closures/kukit/oper.js
==============================================================================
--- kukit/kukit.js/branch/finish-closures/kukit/oper.js (original)
+++ kukit/kukit.js/branch/finish-closures/kukit/oper.js Mon Dec 24 12:38:56 2007
@@ -49,7 +49,9 @@
*
* browserevent: the original browser event.
*/
-op.Oper = function (dict) {
+op.Oper = function() {
+
+this.initialize = function(dict) {
this.node = null;
this.parms = {};
this.eventRule = null;
@@ -57,302 +59,303 @@
this.orignode = null;
this.action = null;
this.browserevent = null;
+ // update from the dict
+ this.unrestrictedUpdate(dict);
+};
- this.clone = function(dict, restricted) {
- var newoper = new kukit.op.Oper(this);
- newoper.unrestrictedUpdate(dict, restricted);
- return newoper;
- };
+this.clone = function(dict, restricted) {
+ var newoper = new kukit.op.Oper(this);
+ newoper.unrestrictedUpdate(dict, restricted);
+ return newoper;
+};
- this.update = function(dict) {
- // restricted attrs must not be changed on existing oper.
- this.unrestrictedUpdate(dict, true);
- };
+this.update = function(dict) {
+ // restricted attrs must not be changed on existing oper.
+ this.unrestrictedUpdate(dict, true);
+};
- this.unrestrictedUpdate = function(dict, restricted) {
- if (typeof(dict) == 'undefined') {
- return;
- }
- for (var key in dict) {
-;;; if (typeof(checkKey) == 'undefined') {
-;;; var checkKey = function(key) {
-;;; var isNode = key == 'node';
-;;; var isParameters = key == 'parms';
-;;; var isEventRule = key == 'eventRule';
-;;; var isBinder = key == 'binder';
-;;; var isOrig = key == 'orignode';
+this.unrestrictedUpdate = function(dict, restricted) {
+ if (typeof(dict) == 'undefined') {
+ return;
+ }
+ for (var key in dict) {
+;;; if (typeof(checkKey) == 'undefined') {
+;;; var checkKey = function(key) {
+;;; var isNode = key == 'node';
+;;; var isParameters = key == 'parms';
+;;; var isEventRule = key == 'eventRule';
+;;; var isBinder = key == 'binder';
+;;; var isOrig = key == 'orignode';
;;; return isNode || isParameters || isEventRule || isBinder ||
isOrig;
-;;; };
-;;; }
-;;; if (restricted && checkKey(key)) {
-;;; kukit.E = 'Illegal update on oper object, protected attribute
[';
-;;; kukit.E += key + '].';
-;;; throw new Error(kukit.E);
-;;; }
- var value = dict[key];
- if (typeof(value) != 'function') {
- this[key] = value;
- }
+;;; };
+;;; }
+;;; if (restricted && checkKey(key)) {
+;;; kukit.E = 'Illegal update on oper object, protected attribute [';
+;;; kukit.E += key + '].';
+;;; throw new Error(kukit.E);
+;;; }
+ var value = dict[key];
+ if (typeof(value) != 'function') {
+ this[key] = value;
}
- };
- // update from the dict
- this.unrestrictedUpdate(dict);
+ }
+};
- this.logDebug = function() {
-;;; var result = [];
-;;; for (var key in this){
-;;; if (key == 'parms') {
-;;; var res2 = [];
-;;; for (var k2 in this.parms){
-;;; res2.push(k2 + '="' + this.parms[k2] + '"');
-;;; }
-;;; result.push('parms={' + res2.join(',') + '}');
-;;; } else if (typeof(kukit.op.Oper.prototype[key]) ==
'undefined') {
-;;; result.push(key + '=' + this[key]);
-;;; }
+this.logDebug = function() {
+;;; var result = [];
+;;; for (var key in this){
+;;; if (key == 'parms') {
+;;; var res2 = [];
+;;; for (var k2 in this.parms){
+;;; res2.push(k2 + '="' + this.parms[k2] + '"');
;;; }
-;;; kukit.logDebug('Oper values: ' + result.join(', '));
- };
+;;; result.push('parms={' + res2.join(',') + '}');
+;;; } else if (typeof(kukit.op.Oper.prototype[key]) == 'undefined') {
+;;; result.push(key + '=' + this[key]);
+;;; }
+;;; }
+;;; kukit.logDebug('Oper values: ' + result.join(', '));
+};
- this.executeClientAction = function(name) {
- // Check kss action parms
- var nodes = null;
- // XXX TODO this should be refactored with parms constraint checking
- for (key in this.kssParms) {
- switch (key) {
- case 'kssSelector': {
- // The value already contains the results
- nodes = this.kssParms[key];
- } break;
- default: {
-;;; kukit.E = 'Wrong parameter : [' + key + '] starts with ';
-;;; kukit.E += '"kss"; normal parms (that do not start with';
-;;; kukit.E += ' "kss") only are allowed in action-client
keys.';
- throw new Error(kukit.E);
- } break;
- }
+this.executeClientAction = function(name) {
+ // Check kss action parms
+ var nodes = null;
+ // XXX TODO this should be refactored with parms constraint checking
+ for (key in this.kssParms) {
+ switch (key) {
+ case 'kssSelector': {
+ // The value already contains the results
+ nodes = this.kssParms[key];
+ } break;
+ default: {
+;;; kukit.E = 'Wrong parameter : [' + key + '] starts with ';
+;;; kukit.E += '"kss"; normal parms (that do not start with';
+;;; kukit.E += ' "kss") only are allowed in action-client keys.';
+ throw new Error(kukit.E);
+ } break;
}
- // XXX TODO refactor this with commands execution (or the other way)
-;;; var nodetext = function(node) {
-;;; if (node) {
-;;; return node.tagName.toLowerCase();
-;;; } else {
-;;; return 'DOCUMENT';
-;;; }
-;;; };
- var executeActions = kukit.actionsGlobalRegistry.get(name);
- if (nodes != null) {
-;;; var msg = nodes.length + ' nodes found for action [' + name + '].';
-;;; kukit.logDebug(msg);
-;;; if (!nodes || nodes.length == 0) {
-;;; kukit.logWarning('Action selector found no nodes.');
-;;; }
- for (var i=0; i < nodes.length; i++) {
- this.node = nodes[i];
- //XXX error handling for wrong command name
-;;; var msg = '[' + name + '] action executes on target (' + (i+1);
-;;; msg += '/' + nodes.length + ') ';
-;;; msg += '[' + nodetext(this.node) + '].';
-;;; kukit.logDebug(msg);
- executeActions(this);
- }
- } else {
- // single node
-;;; var msg = '[' + name + '] action executes on single node ';
+ }
+ // XXX TODO refactor this with commands execution (or the other way)
+;;; var nodetext = function(node) {
+;;; if (node) {
+;;; return node.tagName.toLowerCase();
+;;; } else {
+;;; return 'DOCUMENT';
+;;; }
+;;; };
+ var executeActions = kukit.actionsGlobalRegistry.get(name);
+ if (nodes != null) {
+;;; var msg = nodes.length + ' nodes found for action [' + name + '].';
+;;; kukit.logDebug(msg);
+;;; if (!nodes || nodes.length == 0) {
+;;; kukit.logWarning('Action selector found no nodes.');
+;;; }
+ for (var i=0; i < nodes.length; i++) {
+ this.node = nodes[i];
+ //XXX error handling for wrong command name
+;;; var msg = '[' + name + '] action executes on target (' + (i+1);
+;;; msg += '/' + nodes.length + ') ';
;;; msg += '[' + nodetext(this.node) + '].';
;;; kukit.logDebug(msg);
executeActions(this);
}
- };
+ } else {
+ // single node
+;;; var msg = '[' + name + '] action executes on single node ';
+;;; msg += '[' + nodetext(this.node) + '].';
+;;; kukit.logDebug(msg);
+ executeActions(this);
+ }
+};
- this.executeDefaultAction = function(name, optional) {
- // Check kss action parms
-;;; for (key in this.kssParms) {
-;;; kukit.E = 'Wrong parameter : [' + key + '] starts with "kss";';
-;;; kukit.E += ' normal parms (that do not start with kss)';
-;;; kukit.E += ' only are allowed in action-default keys.';
+this.executeDefaultAction = function(name, optional) {
+ // Check kss action parms
+;;; for (key in this.kssParms) {
+;;; kukit.E = 'Wrong parameter : [' + key + '] starts with "kss";';
+;;; kukit.E += ' normal parms (that do not start with kss)';
+;;; kukit.E += ' only are allowed in action-default keys.';
+;;; throw new Error(kukit.E);
+;;; }
+ //
+ var namespace = this.binder.__eventNamespace__;
+ var kssevent = kukit.eventsGlobalRegistry.get(namespace, name);
+ var methodName = kssevent.defaultActionMethodName;
+ var success = false;
+ if (! methodName) {
+;;; if (! optional) {
+;;; kukit.E = 'Could not trigger event [' + name;
+;;; kukit.E += '] from namespace [' + namespace + '], because this';
+;;; kukit.E += ' event has no default method registered.';
;;; throw new Error(kukit.E);
;;; }
- //
- var namespace = this.binder.__eventNamespace__;
- var kssevent = kukit.eventsGlobalRegistry.get(namespace, name);
- var methodName = kssevent.defaultActionMethodName;
- var success = false;
- if (! methodName) {
-;;; if (! optional) {
-;;; kukit.E = 'Could not trigger event [' + name;
-;;; kukit.E += '] from namespace [' + namespace + '], because
this';
-;;; kukit.E += ' event has no default method registered.';
-;;; throw new Error(kukit.E);
-;;; }
+ } else {
+ // Put defaultParameters to parms!
+ // This makes sure, that for implicit events
+ // you do not need to specify pass(key)
+ // for making the parms arrive to the action.
+ if (typeof(this.defaultParameters) != 'undefined') {
+ this.parms = this.defaultParameters;
} else {
- // Put defaultParameters to parms!
- // This makes sure, that for implicit events
- // you do not need to specify pass(key)
- // for making the parms arrive to the action.
- if (typeof(this.defaultParameters) != 'undefined') {
- this.parms = this.defaultParameters;
- } else {
- this.parms = {};
- }
- this.binder._EventBinder_callMethod(
- namespace, name, this, methodName);
- success = true;
+ this.parms = {};
}
- return success;
- };
+ this.binder._EventBinder_callMethod(
+ namespace, name, this, methodName);
+ success = true;
+ }
+ return success;
+};
- this.executeServerAction = function(name) {
-;;; for (key in this.kssParms) {
-;;; if (key == 'kssUrl') {
-;;; // Value will be evaluated.
-;;; } else if (key == 'kssSubmitForm') {
-;;; // Value will be evaluated.
-;;; } else {
-;;; kukit.E = 'Wrong parameter : [' + key + '] starts with "kss";';
-;;; kukit.E += ' normal parms (that do not start with kss)';
-;;; kukit.E += ' only are allowed in action-server keys.';
-;;; throw new Error(kukit.E);
-;;; }
+this.executeServerAction = function(name) {
+;;; for (key in this.kssParms) {
+;;; if (key == 'kssUrl') {
+;;; // Value will be evaluated.
+;;; } else if (key == 'kssSubmitForm') {
+;;; // Value will be evaluated.
+;;; } else {
+;;; kukit.E = 'Wrong parameter : [' + key + '] starts with "kss";';
+;;; kukit.E += ' normal parms (that do not start with kss)';
+;;; kukit.E += ' only are allowed in action-server keys.';
+;;; throw new Error(kukit.E);
;;; }
- // oper will be accessible to some commands that execute in return
- var sa = new kukit.sa.ServerAction(name, this);
- };
+;;; }
+ // oper will be accessible to some commands that execute in return
+ var sa = new kukit.sa.ServerAction(name, this);
+};
- /* Helpers the serve binding */
+/* Helpers the serve binding */
- this.getEventName = function () {
- // Gets event name
- return this.eventRule.kssSelector.name;
- };
+this.getEventName = function () {
+ // Gets event name
+ return this.eventRule.kssSelector.name;
+};
- this.getEventNamespace = function () {
- // Gets event name
- return this.eventRule.kssSelector.namespace;
- };
+this.getEventNamespace = function () {
+ // Gets event name
+ return this.eventRule.kssSelector.namespace;
+};
- this.hasExecuteActions = function () {
- // Decide if there are any actions (or a default action)
- // to execute. This can speed up execution if in case
- // we have nothing to do, there is no reason to bind
- // the actions hook.
- if (this.eventRule) {
- // if it has actions, the answer is yes
- if (this.eventRule.actions.hasActions())
- return true
- // if we have a default action, we will return true in any case
- // because we may want to call it.
- // The reason for this check is, that a default action is also
- // valid, even if it received no parms in the eventRule,
- // in which case it is not present as an action.
- var kssevent = kukit.eventsGlobalRegistry.get(
- this.getEventNamespace(), this.getEventName())
- var methodName = kssevent.defaultActionMethodName;
- return (typeof methodName != 'undefined');
- } else
- return false;
- };
+this.hasExecuteActions = function () {
+ // Decide if there are any actions (or a default action)
+ // to execute. This can speed up execution if in case
+ // we have nothing to do, there is no reason to bind
+ // the actions hook.
+ if (this.eventRule) {
+ // if it has actions, the answer is yes
+ if (this.eventRule.actions.hasActions())
+ return true
+ // if we have a default action, we will return true in any case
+ // because we may want to call it.
+ // The reason for this check is, that a default action is also
+ // valid, even if it received no parms in the eventRule,
+ // in which case it is not present as an action.
+ var kssevent = kukit.eventsGlobalRegistry.get(
+ this.getEventNamespace(), this.getEventName())
+ var methodName = kssevent.defaultActionMethodName;
+ return (typeof methodName != 'undefined');
+ } else
+ return false;
+};
- this.makeExecuteActionsHook = function (filter) {
- // Factory that creates the function that executes the actions.
- // The function may take a dict that is updated on the oper
- // If filter is specified, it will we called with a function and
- // the event will only be triggered if the filter returned true.
- // THe return value of func_to_bind will show if the event
- // has executed or not.
- //
- // Speedup.
- if (! this.hasExecuteActions()) {
- return function() {};
- }
- var eventName = this.getEventName();
- var self = this;
- var func_to_bind = function(dict) {
- // (XXX XXX TODO it should happen here, that we change to a
different
- // oper class. This is for the future when we separate the BindOper
- // from the ActionOper.)
- var newoper = self.clone(dict, true);
- // call the filter and if it says skip it, we are done
- // (Filter has a chance to set a defaultParameters on oper.
- if (filter && ! filter(newoper)) return false;
- // execute the event's actions
- newoper.binder._EventBinder_triggerEvent(eventName, newoper);
- // show that the event's actions have been executed
- return true;
- };
- return func_to_bind;
+this.makeExecuteActionsHook = function (filter) {
+ // Factory that creates the function that executes the actions.
+ // The function may take a dict that is updated on the oper
+ // If filter is specified, it will we called with a function and
+ // the event will only be triggered if the filter returned true.
+ // THe return value of func_to_bind will show if the event
+ // has executed or not.
+ //
+ // Speedup.
+ if (! this.hasExecuteActions()) {
+ return function() {};
+ }
+ var eventName = this.getEventName();
+ var self = this;
+ var func_to_bind = function(dict) {
+ // (XXX XXX TODO it should happen here, that we change to a different
+ // oper class. This is for the future when we separate the BindOper
+ // from the ActionOper.)
+ var newoper = self.clone(dict, true);
+ // call the filter and if it says skip it, we are done
+ // (Filter has a chance to set a defaultParameters on oper.
+ if (filter && ! filter(newoper)) return false;
+ // execute the event's actions
+ newoper.binder._EventBinder_triggerEvent(eventName, newoper);
+ // show that the event's actions have been executed
+ return true;
};
+ return func_to_bind;
+};
- /* Utility for parameter checking */
+/* Utility for parameter checking */
- this.evaluateParameters =
- function(mandatory, defaults, errname, allow_excess) {
- // Checks if mandatory params are supplied and there are no excess
params
- // also fill up default values
- // Parms are cloned and returned.
- // Example:
- // oper.evaluateParameters(['mand1', 'mand2'], {'key1': 'defval'},
- // 'event X');
-;;; if (typeof(allow_excess) == 'undefined') {
-;;; allow_excess = false;
-;;; }
- var newParameters = {};
- for (var i=0; i<mandatory.length; i++) {
- var next = mandatory[i];
-;;; if (typeof(this.parms[next]) == 'undefined') {
-;;; kukit.E = 'Missing mandatory parameter [' + next;
-;;; kukit.E += '] in [' + errname + '].';
-;;; throw new Error(kukit.E);
-;;; }
- newParameters[next] = this.parms[next];
- }
- for (var key in defaults){
- var val = this.parms[key];
- if (typeof(val) == 'undefined') {
- newParameters[key] = defaults[key];
- } else {
- newParameters[key] = val;
- }
+this.evaluateParameters =
+ function(mandatory, defaults, errname, allow_excess) {
+ // Checks if mandatory params are supplied and there are no excess params
+ // also fill up default values
+ // Parms are cloned and returned.
+ // Example:
+ // oper.evaluateParameters(['mand1', 'mand2'], {'key1': 'defval'},
+ // 'event X');
+;;; if (typeof(allow_excess) == 'undefined') {
+;;; allow_excess = false;
+;;; }
+ var newParameters = {};
+ for (var i=0; i<mandatory.length; i++) {
+ var next = mandatory[i];
+;;; if (typeof(this.parms[next]) == 'undefined') {
+;;; kukit.E = 'Missing mandatory parameter [' + next;
+;;; kukit.E += '] in [' + errname + '].';
+;;; throw new Error(kukit.E);
+;;; }
+ newParameters[next] = this.parms[next];
+ }
+ for (var key in defaults){
+ var val = this.parms[key];
+ if (typeof(val) == 'undefined') {
+ newParameters[key] = defaults[key];
+ } else {
+ newParameters[key] = val;
}
- for (var key in this.parms){
- if (typeof(newParameters[key]) == 'undefined') {
-;;; if (allow_excess) {
- newParameters[key] = this.parms[key];
-;;; } else {
-;;; throw new Error('Excess parameter [' + key + '] in [' +
errname + '].');
-;;; }
- }
+ }
+ for (var key in this.parms){
+ if (typeof(newParameters[key]) == 'undefined') {
+;;; if (allow_excess) {
+ newParameters[key] = this.parms[key];
+;;; } else {
+;;; throw new Error('Excess parameter [' + key + '] in [' +
errname + '].');
+;;; }
}
- this.parms = newParameters;
- };
+ }
+ this.parms = newParameters;
+};
- this.completeParms =
- function(mandatory, defaults, errname, allow_excess) {
-;;; var msg = 'Deprecated [Oper.completeParms],';
-;;; msg += 'use [Oper.evaluateParameters] instead !';
-;;; kukit.logWarning(msg);
- this.evaluateParameters(mandatory, defaults, errname, allow_excess);
- };
+this.completeParms =
+ function(mandatory, defaults, errname, allow_excess) {
+;;; var msg = 'Deprecated [Oper.completeParms],';
+;;; msg += 'use [Oper.evaluateParameters] instead !';
+;;; kukit.logWarning(msg);
+ this.evaluateParameters(mandatory, defaults, errname, allow_excess);
+};
- this.evalBool = function(key, errname) {
- var value = this.parms[key];
-;;; kukit.E = 'for key [' + key + '] in [' + errname + '].';
- this.parms[key] = kukit.ut.evalBool(value, kukit.E);
- };
+this.evalBool = function(key, errname) {
+ var value = this.parms[key];
+;;; kukit.E = 'for key [' + key + '] in [' + errname + '].';
+ this.parms[key] = kukit.ut.evalBool(value, kukit.E);
+};
- this.evalInt = function(key, errname) {
- var value = this.parms[key];
-;;; kukit.E = 'for key [' + key + '] in [';
-;;; kukit.E += errname || this.componentName + '].';
- this.parms[key] = kukit.ut.evalInt(value, kukit.E);
- };
+this.evalInt = function(key, errname) {
+ var value = this.parms[key];
+;;; kukit.E = 'for key [' + key + '] in [';
+;;; kukit.E += errname || this.componentName + '].';
+ this.parms[key] = kukit.ut.evalInt(value, kukit.E);
+};
- this.evalList = function(key, errname) {
- var value = this.parms[key];
-;;; kukit.E = 'for key [' + key + '] in [';
-;;; kukit.E += errname || this.componentName + '].';
- this.parms[key] = kukit.ut.evalList(value, kukit.E);
- };
+this.evalList = function(key, errname) {
+ var value = this.parms[key];
+;;; kukit.E = 'for key [' + key + '] in [';
+;;; kukit.E += errname || this.componentName + '].';
+ this.parms[key] = kukit.ut.evalList(value, kukit.E);
+};
;;; this.debugInformation = function() {
;;; if (this.eventRule) {
@@ -368,7 +371,8 @@
;;; return message;
;;; }
;;; return '';
-;;; };
+;;; };
+this.initialize.apply(this, arguments);
};
}(); /// MODULE END
_______________________________________________
Kukit-checkins mailing list
[email protected]
http://codespeak.net/mailman/listinfo/kukit-checkins
