Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

GraphViewer: Optmized layout, there was a miss-typing of a class name

This commit is contained in:
Michael Hackstein 2013-05-24 15:54:37 +02:00
parent a814860c3f
commit fe2825df88
5 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
html/admin/css/graphView.css
View File

@ -27,6 +27,16 @@
margin-right: 10px;
}
svg.graphViewer text {
font: 11px Arial;
pointer-events: none;
stroke: #000;
}
.capitalize {
text-transform:capitalize;
}
svg.graphViewer {
border-style: groove;
}

2
html/admin/js/graphViewer/graph/nodeReducer.js
View File

@ -331,8 +331,6 @@ function NodeReducer(nodes, edges) {
return res[0];
};
self.bucketNodes = function(toSort, numBuckets) {
var res = [],
threshold = 0.3;

44
html/admin/js/graphViewer/jasmine_test/specAdapter/arangoAdapterUISpec.js
View File

@ -47,7 +47,7 @@
};
list = document.createElement("ul");
document.body.appendChild(list);
list.id = "control_list";
list.id = "control_adapter_list";
adapterUI = new ArangoAdapterControls(list, adapter);
spyOn(adapter, 'changeTo');
this.addMatchers({
@ -88,17 +88,17 @@
runs(function() {
adapterUI.addControlChangeCollections();
expect($("#control_list #control_collections").length).toEqual(1);
expect($("#control_list #control_collections")[0]).toConformToListCSS();
expect($("#control_adapter_list #control_adapter_collections").length).toEqual(1);
expect($("#control_adapter_list #control_adapter_collections")[0]).toConformToListCSS();
helper.simulateMouseEvent("click", "control_collections");
helper.simulateMouseEvent("click", "control_adapter_collections");
expect($("#control_collections_modal").length).toEqual(1);
expect($("#control_adapter_collections_modal").length).toEqual(1);
$("#control_collections_nodecollection").attr("value", "newNodes");
$("#control_collections_edgecollection").attr("value", "newEdges");
$("#control_adapter_collections_nodecollection").attr("value", "newNodes");
$("#control_adapter_collections_edgecollection").attr("value", "newEdges");
helper.simulateMouseEvent("click", "control_collections_submit");
helper.simulateMouseEvent("click", "control_adapter_collections_submit");
expect(adapter.changeTo).toHaveBeenCalledWith(
"newNodes",
@ -109,7 +109,7 @@
});
waitsFor(function() {
return $("#control_collections_modal").length === 0;
return $("#control_adapter_collections_modal").length === 0;
}, 2000, "The modal dialog should disappear.");
});
@ -117,13 +117,13 @@
it('should change collections and traversal direction to directed', function() {
runs(function() {
adapterUI.addControlChangeCollections();
helper.simulateMouseEvent("click", "control_collections");
helper.simulateMouseEvent("click", "control_adapter_collections");
$("#control_collections_nodecollection").attr("value", "newNodes");
$("#control_collections_edgecollection").attr("value", "newEdges");
$("#control_collections_undirected").attr("checked", false);
$("#control_adapter_collections_nodecollection").attr("value", "newNodes");
$("#control_adapter_collections_edgecollection").attr("value", "newEdges");
$("#control_adapter_collections_undirected").attr("checked", false);
helper.simulateMouseEvent("click", "control_collections_submit");
helper.simulateMouseEvent("click", "control_adapter_collections_submit");
expect(adapter.changeTo).toHaveBeenCalledWith(
"newNodes",
@ -134,7 +134,7 @@
});
waitsFor(function() {
return $("#control_collections_modal").length === 0;
return $("#control_adapter_collections_modal").length === 0;
}, 2000, "The modal dialog should disappear.");
});
@ -142,12 +142,12 @@
it('should change collections and traversal direction to undirected', function() {
runs(function() {
adapterUI.addControlChangeCollections();
helper.simulateMouseEvent("click", "control_collections");
$("#control_collections_nodecollection").attr("value", "newNodes");
$("#control_collections_edgecollection").attr("value", "newEdges");
$("#control_collections_undirected").attr("checked", true);
helper.simulateMouseEvent("click", "control_adapter_collections");
$("#control_adapter_collections_nodecollection").attr("value", "newNodes");
$("#control_adapter_collections_edgecollection").attr("value", "newEdges");
$("#control_adapter_collections_undirected").attr("checked", true);
helper.simulateMouseEvent("click", "control_collections_submit");
helper.simulateMouseEvent("click", "control_adapter_collections_submit");
expect(adapter.changeTo).toHaveBeenCalledWith(
"newNodes",
@ -158,14 +158,14 @@
});
waitsFor(function() {
return $("#control_collections_modal").length === 0;
return $("#control_adapter_collections_modal").length === 0;
}, 2000, "The modal dialog should disappear.");
});
it('should be able to add all controls to the list', function() {
adapterUI.addAll();
expect($("#control_list #control_collections").length).toEqual(1);
expect($("#control_adapter_list #control_adapter_collections").length).toEqual(1);
});
});
}());

2
html/admin/js/graphViewer/ui/arangoAdapterControls.js
View File

@ -41,7 +41,7 @@ function ArangoAdapterControls(list, adapter) {
baseClass = "adapter";
this.addControlChangeCollections = function() {
var prefix = "control_collections",
var prefix = "control_adapter_collections",
idprefix = prefix + "_";
uiComponentsHelper.createButton(baseClass, list, "Collections", prefix, function() {
modalDialogHelper.createModalDialog("Switch Collections",

6
html/admin/js/graphViewer/ui/modalDialogHelper.js
View File

@ -57,7 +57,7 @@ var modalDialogHelper = modalDialogHelper || {};
document.body.removeChild(div);
};
headerDiv.className = "modal_header";
headerDiv.className = "modal-header";
buttonDismiss.className = "close";
buttonDismiss.dataDismiss = "modal";
@ -66,11 +66,11 @@ var modalDialogHelper = modalDialogHelper || {};
header.appendChild(document.createTextNode(title));
bodyDiv.className = "modal_body";
bodyDiv.className = "modal-body";
bodyTable.id = idprefix + "table";
footerDiv.className = "modal_footer";
footerDiv.className = "modal-footer";
buttonCancel.id = idprefix + "cancel";
buttonCancel.className = "btn btn-danger pull-left";