change master

Author: Francesca-Bit

.travis.yml

@@ -1,6 +1,6 @@
 before_script:
   - |
-    if [[  $TRAVIS_BRANCH == 'clientBuild' && $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*  ]]; then
+    if [[  $TRAVIS_BRANCH == 'master' && $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*  ]]; then
       echo "__INCREMENT_VERSION_NUMBER__"
       export PACKAGE_VERSION=$(npm version patch)
       npm install -g documentation
@@ -20,7 +20,8 @@ after_script:
 
 branches:
   only:
-    - clientBuild
+    - master
+    - dev
 
 before_deploy:
   - |
@@ -41,7 +42,7 @@ deploy:
     keep_history: true
     script: bash public_pages.sh
     on:
-      branch: clientBuild 
+      branch: master 
       condition: $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*
   - provider: releases
     target_commitish : $LAST_HASH
@@ -50,7 +51,7 @@ deploy:
     skip_cleanup: true
     overwrite: true
     on:
-      branch: clientBuild 
+      branch: master 
       condition: $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*  
   - provider: npm
     registry: "https://registry.npmjs.org/"
@@ -61,5 +62,5 @@ deploy:
     keep_history: true
     auth_method: "authToken"
     on:
-      branch : clientBuild
+      branch : master
       condition: $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*

lib/viewer/graphConfig.js

@@ -73,17 +73,29 @@ WOQLGraphConfig.prototype.selected_grows = function(v){
 	return this.bigsel;
 }
 
-WOQLGraphConfig.prototype.width = function(v){
-	if(typeof v != "undefined"){
-		this.gwidth = v;
+/**
+ * no parameter get the graph width or
+ * set the graph width and return the WOQLGraphConfig
+ * @param {size} Number
+ */
+
+WOQLGraphConfig.prototype.width = function(size){
+	if(typeof size != "undefined"){
+		this.gwidth = size;
 		return this;
 	}
 	return this.gwidth;
 }
 
-WOQLGraphConfig.prototype.height = function(v){
-	if(typeof v != "undefined"){
-		this.gheight = v;
+/**
+ * no parameter get the graph height or
+ * set the graph height and return the WOQLGraphConfig
+ * @param {size} Number
+ */
+
+WOQLGraphConfig.prototype.height = function(size){
+	if(typeof size != "undefined"){
+		this.gheight = size;
 		return this;
 	}
 	return this.gheight;

lib/woqlClient.js

@@ -320,6 +320,10 @@ WOQLClient.prototype.update = function (qurl, woql, opts) {
 		);
 	}
 	const fileList = opts ? opts.fileList : {};
+
+	//var formData = new FormData();
+    //formData.set('file', file);
+	
 	let q = {'terminus:query' : JSON.stringify(woql), ...fileList};
 
 	q = this.addOptionsToWOQL(q, opts);