small tweaks to program objects

Author: kevinchekovfeeney

lib/framePattern.js

@@ -302,7 +302,7 @@ FramePattern.prototype.getRendererType = function(frame){
 }
 
 function FrameRule(){
-	this.rule = { pattern: {}};
+	this.rule = { pattern: {} };
 	return this;
 }
 
@@ -311,26 +311,6 @@ FrameRule.prototype.scope = function(scope){
 	return this;
 }
 
-FrameRule.prototype.renderer = function(rend){
-	this.rule.renderer = rend;
-	return this;
-}
-
-FrameRule.prototype.render = function(func){
-	this.rule.render = func;
-	return this;
-}
-
-FrameRule.prototype.args = function(json){
-	this.rule.args = json;
-	return this;
-}
-
-FrameRule.prototype.compare = function(func){
-	this.rule.compare = func;
-	return this;
-}
-
 FrameRule.prototype.frame_type = function(...frametype){
 	this.rule.pattern.frametype = frame_type;
 	return this;
@@ -404,5 +384,103 @@ FrameRule.prototype.status = function(...status){
 	return this;	
 }
 
+FrameRule.prototype.renderer = function(rend){
+	if(!rend) return this.rule.renderer;
+	this.rule.renderer = rend;
+	return this;
+}
+
+FrameRule.prototype.render = function(func){
+	if(func){
+		this.rule.render = func;
+		return this;
+	}
+	return func;
+}
+
+FrameRule.prototype.args = function(json){
+	if(!json) return this.rule.args;
+	this.rule.args = json;
+	return this;
+}
+
+FrameRule.prototype.compare = function(func){
+	if(!func) return this.rule.compare;
+	this.rule.compare = func;
+	return this;
+}
+
+FrameRule.prototype.mode = function(m){
+	if(!m) return this.rule.mode;
+	this.rule.mode = m;
+	return this;
+}
+
+FrameRule.prototype.collapse = function(m){
+	if(!m) return this.rule.collapse;
+	this.rule.collapse = m;
+	return this;
+}
+
+
+FrameRule.prototype.hidden = function(m){
+	if(!m) return this.rule.hidden;
+	this.rule.hidden = m;
+	return this;
+}
+
+FrameRule.prototype.view = function(m){
+	if(!m) return this.rule.view;
+	this.rule.view = m;
+	return this;
+}
+
+FrameRule.prototype.show_disabled_buttons = function(m){
+	if(!m) return this.rule.show_disabled_buttons;
+	this.rule.hide_disabled_buttons = m;
+	return this;
+}
+
+FrameRule.prototype.features = function(m){
+	if(!m) return this.rule.features;
+	this.rule.features = m;
+	return this;
+}
+
+FrameRule.prototype.header_features = function(m){
+	if(!m) return this.rule.header_features;
+	this.rule.header_features = m;
+	return this;
+}
+
+FrameRule.prototype.header = function(m){
+	if(!m) return this.rule.header;
+	this.rule.header = m;
+	return this;
+}
+
+FrameRule.prototype.feature_renderers = function(m){
+	if(!m) return this.rule.feature_renderers;
+	this.rule.feature_renderers = m;
+	return this;
+}
+
+FrameRule.prototype.show_empty = function(m){
+	if(!m) return this.rule.show_empty;
+	this.rule.show_empty = m;
+	return this;
+}
+
+FrameRule.prototype.dataviewer = function(m){
+	if(!m) return this.rule.dataviewer;
+	this.rule.dataviewer = m;
+	return this;
+}
+
+FrameRule.prototype.dataviewer_options = function(m){
+	if(!m) return this.rule.dataviewer_options;
+	this.rule.dataviewer_options = m;
+	return this;
+}
 
 module.exports = {FramePatternMatcher, FramePattern, FrameRule } ;

lib/objectFrame.js

@@ -445,7 +445,7 @@ function PropertyFrame(property, cframe, parent){
 
 PropertyFrame.prototype.addFrame = function (frame) {
 	if(this.cframe.isData()){
-		var df = new DataFrame(frame, this);
+		var df = new DataFrame(frame, this, this.values.length);
 		this.values.push(df);
 	}
 	else {
@@ -602,11 +602,12 @@ PropertyFrame.prototype.sortValues = function(){
 	return this.values;
 }
 
-function DataFrame(frame, parent) {
+function DataFrame(frame, parent, index) {
 	this.err = false;
 	this.parent = parent;
 	// the id of the object that owns this dataframe
 	this.subjid = (parent ? parent.subjid : false);
+	this.index = index;
 	if (frame) {
 		this.load(frame);
 	}