summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-04-08 09:09:03 +0300
committerAlon Levy <alon@pobox.com>2015-04-09 06:39:23 +0300
commit02e4e2ce0467f7855dfebcaa0a68576714b1e914 (patch)
tree7667e6e4b36b71935f37eb59fa8bcba1b2180c64 /src
parent1ff4cc238422500a7795260c81aa7248f8e9cbaf (diff)
client: remove custom radius that wasn't used anyway. radius is 10. if returned, place in domain specific type information
Diffstat (limited to 'src')
-rw-r--r--src/client/rz_core.js4
-rw-r--r--src/client/view/graph_view.js6
-rw-r--r--src/client/view/helpers.js39
-rw-r--r--src/client/view/item_info.js4
4 files changed, 7 insertions, 46 deletions
diff --git a/src/client/rz_core.js b/src/client/rz_core.js
index 5ab8456f..b4c191dd 100644
--- a/src/client/rz_core.js
+++ b/src/client/rz_core.js
@@ -1,7 +1,7 @@
"use strict"
-define(['jquery', 'd3', 'consts', 'rz_bus', 'util', 'model/graph', 'model/core', 'view/helpers', 'view/item_info', 'rz_observer', 'view/selection', 'rz_mesh', 'model/diff', "view/graph_view", 'view/svg_input', 'view/filter_menu'],
-function($, d3, consts, rz_bus, util, model_graph, model_core, view_helpers, item_info, rz_observer, selection, rz_mesh, model_diff, graph_view, svg_input, filter_menu) {
+define(['jquery', 'd3', 'consts', 'rz_bus', 'util', 'model/graph', 'model/core', 'view/item_info', 'rz_observer', 'view/selection', 'rz_mesh', 'model/diff', "view/graph_view", 'view/svg_input', 'view/filter_menu'],
+function($, d3, consts, rz_bus, util, model_graph, model_core, item_info, rz_observer, selection, rz_mesh, model_diff, graph_view, svg_input, filter_menu) {
var addednodes = [],
vis,
diff --git a/src/client/view/graph_view.js b/src/client/view/graph_view.js
index 2fb031fb..fba5a7f7 100644
--- a/src/client/view/graph_view.js
+++ b/src/client/view/graph_view.js
@@ -25,8 +25,8 @@
* which resulted in overly complex (read: undefined/buggy) code.
*/
-define(['d3', 'Bacon', 'consts', 'util', 'view/selection', 'view/helpers', 'model/diff', 'view/item_info', 'view/bubble', 'model/types', 'view/layouts'],
-function(d3 , Bacon, consts, util , selection , view_helpers, model_diff , item_info, view_bubble, model_types, view_layouts) {
+define(['d3', 'Bacon', 'consts', 'util', 'view/selection', 'model/diff', 'view/item_info', 'view/bubble', 'model/types', 'view/layouts'],
+function(d3 , Bacon, consts, util , selection , model_diff , item_info, view_bubble, model_types, view_layouts) {
"use strict"
@@ -688,7 +688,7 @@ function GraphView(spec) {
return d.type + " " + d.state + " circle graph";
})
.attr("r", function(d) {
- return view_helpers.customSize(d.type) - 2;
+ return 10;
})
.on("click", function(d, i) {
if (d3.event.defaultPrevented) {
diff --git a/src/client/view/helpers.js b/src/client/view/helpers.js
deleted file mode 100644
index 2cdda49b..00000000
--- a/src/client/view/helpers.js
+++ /dev/null
@@ -1,39 +0,0 @@
-"use strict"
-
-define(function() {
-function customSize(type) {
- var size;
- switch (type) {
- case "person":
- size = 12;
- break;
- case "club":
- size = 12;
- break;
- case "skill":
- size = 12;
- break;
- case "internship":
- size = 12;
- break;
- case "interest":
- size = 12;
- break;
- case "empty":
- size = 9;
- break;
- case "chainlink":
- size = 8;
- break;
- default:
- size = 9;
- break;
- }
- return size;
-}
-
-
-return {
- customSize: customSize,
-};
-});
diff --git a/src/client/view/item_info.js b/src/client/view/item_info.js
index 719fe9f2..3d9ca7e7 100644
--- a/src/client/view/item_info.js
+++ b/src/client/view/item_info.js
@@ -1,5 +1,5 @@
-define(['jquery', 'jquery-ui', 'util', 'consts', 'view/helpers', 'model/diff', 'model/types', 'model/graph', 'messages'],
-function($, _unused_jquery_ui, util, consts, view_helpers, model_diff, model_types, graph, messages) {
+define(['jquery', 'jquery-ui', 'util', 'consts', 'model/diff', 'model/types', 'model/graph', 'messages'],
+function($, _unused_jquery_ui, util, consts, model_diff, model_types, graph, messages) {
"strict"