Merge branch 'dev' of https://github.com/terminusdb/terminus-client into dev

Author: Cheukting

.eslintrc

@@ -1,49 +1,3 @@
-/**
- * FramePatternMatcher does pattern matching on frames 
- * Does a given pattern match a given frame?
- */
-const FramePatternMatcher = {}
-
-/**
- * Runs an array of matching rules across a frame and calls the passed onmatch function on each match
- * The optional onmatch function is called with each hit and is passed the frame and the rule that hit it.
- * A list of the matched rules is returned. 
- * 
- */
-FramePatternMatcher.testRules = function(rules, frame, onmatch){
-	var matched_rules = [];
-	if(rules && rules.length){
-		for(var i = 0; i<rules.length; i++){
-			var match = (!rules[i].rule.pattern || FramePatternMatcher.patternMatchesFrame(rules[i].rule.pattern, frame));
-			if(match){
-				matched_rules.push(rules[i]);
-				if(onmatch && typeof onmatch == "function"){
-					onmatch(frame, rules[i]);
-				}
-			}
-		}
-	}
-	return matched_rules;
-}
-
-/**
- * Determines whether a given pattern matches a given frame
- */
-FramePatternMatcher.patternMatchesFrame = function(pattern, frame){
-	if(typeof pattern == "object" && pattern.length){ //multiple patterns are ANDed
-		for(var i = 0 ; i<pattern.length; i++){
-			var fp = new FramePattern(pattern[i]);
-			if(!fp.checkFrame(frame)) return false;
-		}
-		return true;
-	}
-	else {
-		var fp = new FramePattern(pattern);
-		return fp.checkFrame(frame);
-	}
-}
-
-
 /**
  * A frame pattern can have the following variables
  * renderer : object, property, data, * - matches a specific part of the frame 
@@ -61,7 +15,7 @@ FramePatternMatcher.patternMatchesFrame = function(pattern, frame){
  * status: updated, error, new, ok,  
  */
 
-FramePattern = function(pattern){
+function FramePattern(pattern){
 	if(pattern){
 		this.setPattern(pattern);
 	}
@@ -301,6 +255,57 @@ FramePattern.prototype.getRendererType = function(frame){
 	return false;
 }
 
+
+
+
+
+/**
+ * FramePatternMatcher does pattern matching on frames 
+ * Does a given pattern match a given frame?
+ */
+const FramePatternMatcher = {}
+
+/**
+ * Runs an array of matching rules across a frame and calls the passed onmatch function on each match
+ * The optional onmatch function is called with each hit and is passed the frame and the rule that hit it.
+ * A list of the matched rules is returned. 
+ * 
+ */
+FramePatternMatcher.testRules = function(rules, frame, onmatch){
+	var matched_rules = [];
+	if(rules && rules.length){
+		for(var i = 0; i<rules.length; i++){
+			var match = (!rules[i].rule.pattern || FramePatternMatcher.patternMatchesFrame(rules[i].rule.pattern, frame));
+			if(match){
+				matched_rules.push(rules[i]);
+				if(onmatch && typeof onmatch == "function"){
+					onmatch(frame, rules[i]);
+				}
+			}
+		}
+	}
+	return matched_rules;
+}
+
+/**
+ * Determines whether a given pattern matches a given frame
+ */
+FramePatternMatcher.patternMatchesFrame = function(pattern, frame){
+	if(typeof pattern == "object" && pattern.length){ //multiple patterns are ANDed
+		for(var i = 0 ; i<pattern.length; i++){
+			var fp = new FramePattern(pattern[i]);
+			if(!fp.checkFrame(frame)) return false;
+		}
+		return true;
+	}
+	else {
+		var fp = new FramePattern(pattern);
+		return fp.checkFrame(frame);
+	}
+}
+
+
+
 function FrameRule(){
 	this.rule = { pattern: {} };
 	return this;