Author: jmorliaguet
Date: Mon Jan 9 22:30:53 2006
New Revision: 2200
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
Log:
- simpler code / fewer variables
Modified: cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js (original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js Mon Jan 9
22:30:53 2006
@@ -191,18 +191,14 @@
if (!window.Identifiable) var Identifiable = new Object();
Object.extend(Identifiable, {
- isIdentifiable: function(element) {
- var node = $(element);
- if (node.nodeType == 1 && node.getAttribute("id")) {
- return true;
- } else {
- return false;
- }
+ isIdentifiable: function(node) {
+ node = $(node);
+ return (node.nodeType == 1 && node.getAttribute("id") != null);
},
- getOrder: function(element) {
+ getOrder: function(node) {
+ node = $(node);
var order = 0;
- var node = $(element);
var nodes = node.parentNode.childNodes;
for (var i=0;i<nodes.length;i++) {
var n = nodes[i];
@@ -212,8 +208,8 @@
return order;
},
- getNext: function(element) {
- var node = $(element);
+ getNext: function(node) {
+ node = $(node);
while (node) {
node = node.nextSibling;
if (!node) return null;
@@ -222,8 +218,8 @@
return null;
},
- getPrevious: function(element) {
- var node = $(element);
+ getPrevious: function(node) {
+ node = $(node);
while (node) {
node = node.previousSibling;
if (!node) return null;
@@ -232,8 +228,8 @@
return null;
},
- getParent: function(element) {
- var node = $(element);
+ getParent: function(node) {
+ node = $(node);
while (node) {
node = node.parentNode;
if (!node) return null;
@@ -242,14 +238,14 @@
return null;
},
- getIdentifiable: function(element) {
- var node = $(element);
+ getIdentifiable: function(node) {
+ node = $(node);
if (this.isIdentifiable(node)) { return node; }
return this.getParent(node);
},
- isEmpty: function(element) {
- var node = $(element);
+ isEmpty: function(node) {
+ node = $(node);
var nodes = node.getElementsByTagName("*");
for (var i=0;i<nodes.length;i++) {
if (this.isIdentifiable(nodes[i])) { return false; }
@@ -265,8 +261,8 @@
json_regexp: new RegExp(/^\sdata:/),
- _getCommentNode: function(element) {
- var node = $(element);
+ _getCommentNode: function(node) {
+ node = $(node);
while(node = node.previousSibling) {
var type = node.nodeType;
if (type == 1) return null;
@@ -280,7 +276,7 @@
},
getNodeData: function(node) {
- var node = $(node);
+ node = $(node);
var node_id = Identifiable.isIdentifiable(node) ?
node.getAttribute("id") : null;
if (node_id && node_id in CPSSkins.Cache) {
@@ -304,7 +300,7 @@
},
setNodeData: function(node, data) {
- var node = $(node);
+ node = $(node);
var node_id = Identifiable.isIdentifiable(node) ?
node.getAttribute("id") : null;
@@ -331,11 +327,11 @@
},
- updateNodeData: function(element, data) {
- var node = $(element);
- var current = this.getNodeData(element) || new Object();
+ updateNodeData: function(node, data) {
+ node = $(node);
+ var current = this.getNodeData(node) || new Object();
Object.extend(current, data);
- this.setNodeData(element, current);
+ this.setNodeData(node, current);
},
createNode: function(options) {
@@ -360,30 +356,30 @@
}
},
- moveTo: function(element, x, y) {
- var element = $(element);
- Position.absolutize(element);
- element.style.left = x + "px";
- element.style.top = y + "px";
+ moveTo: function(node, x, y) {
+ node = $(node);
+ Position.absolutize(node);
+ node.style.left = x + "px";
+ node.style.top = y + "px";
},
- fitInsideScreen: function(element) {
- var element = $(element);
- Position.absolutize(element);
- var dimensions = Element.getDimensions(element);
+ fitInsideScreen: function(node) {
+ node = $(node);
+ Position.absolutize(node);
+ var dimensions = Element.getDimensions(node);
var width = dimensions.width;
var height = dimensions.height;
var page_w = window.innerWidth || document.body.clientWidth;
var page_h = window.innerHeight || document.body.clientHeight;
- var top = element.style.top;
- var left = element.style.left;
+ var top = node.style.top;
+ var left = node.style.left;
if (top) {
top = parseInt(top);
- if (top + height > page_h) { element.style.top = top - height + "px"};
+ if (top + height > page_h) { node.style.top = top - height + "px"};
}
if (left) {
left = parseInt(left);
- if (left + width > page_w) { element.style.left = left - width + "px"};
+ if (left + width > page_w) { node.style.left = left - width + "px"};
}
},
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
