another set of fix for all bio and cyto views; work on #317

geneontology · Mar 18, 2016 · 0dc3fbc · 0dc3fbc
1 parent a561e5c
commit 0dc3fbc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -255,6 +255,8 @@ gulp.task('install', ['build', 'compile']);
 // TODO/BUG: This should eventually be replaced by a read of
 // javascript/web.
 var web_compilables = [
+    'AmiGOBioView.js',
+    'AmiGOCytoView.js',
     'BulkSearch.js',
     'GeneralSearchForwarding.js',
     'Gannet.js',

diff --git a/javascript/web/AmiGOBioView.js b/javascript/web/AmiGOBioView.js
@@ -19,8 +19,6 @@ var bbop = require('bbop-core');
 // Help with strings and colors--configured separately.
 var amigo = new (require('amigo2-instance-data'))(); // no overload
 
-var aid = amigo.data.context;
-
 var model = require('bbop-graph-noctua');
 
 var cytoscape = require('cytoscape');
@@ -52,8 +50,7 @@ var minerva_requests = require('minerva-requests');
 var noctua_model = require('bbop-graph-noctua');
 
 //
-var sd = new amigo.data.server();
-var gserv = sd.golr_base();
+var gserv = amigo.data.server.golr_base;
 
 var jquery_engine = require('bbop-rest-manager').jquery;
 var golr_manager = require('bbop-manager-golr');
@@ -168,8 +165,8 @@ var AmiGOBioViewInit = function(model_ids){
 		    source: e.subject_id(),
 		    target: e.object_id(),
 		    predicate: e.predicate_id(),
-		    label: aid.readable(e.predicate_id()),
-		    color: aid.color(e.predicate_id())
+		    label: amigo.readable(e.predicate_id()),
+		    color: amigo.color(e.predicate_id())
 		}
 	    });
 	});

diff --git a/javascript/web/AmiGOCytoView.js b/javascript/web/AmiGOCytoView.js
@@ -21,7 +21,7 @@ var amigo = new (require('amigo2-instance-data'))(); // no overload
 var barista_response = require('bbop-response-barista');
 
 // Help with strings and colors--configured separately.
-var aid = amigo.data.context;
+//var aid = amigo.data.context;
 
 var model = require('bbop-graph-noctua');
 
@@ -152,8 +152,8 @@ var AmiGOCytoViewInit = function(user_token){
 		    source: e.subject_id(),
 		    target: e.object_id(),
 		    predicate: e.predicate_id(),
-		    label: aid.readable(e.predicate_id()),
-		    color: aid.color(e.predicate_id())
+		    label: amigo.readable(e.predicate_id()),
+		    color: amigo.color(e.predicate_id())
 		}
 	    });
 	});