Browse Source

fixed merge

css_transitions
Alex de Mulder 10 years ago
parent
commit
544a4f32fd
9 changed files with 34 additions and 57 deletions
  1. +0
    -0
      dist/img/addNodeIcon.png
  2. +0
    -0
      dist/img/backIcon.png
  3. +0
    -0
      dist/img/connectIcon.png
  4. +0
    -0
      dist/img/deleteIcon.png
  5. +8
    -26
      dist/vis.js
  6. +9
    -9
      dist/vis.min.js
  7. +11
    -11
      examples/graph/20_UI_example.html
  8. +0
    -5
      src/graph/Graph.js
  9. +6
    -6
      src/graph/SelectionMixin.js

dist/UI_icons/addNodeIcon.png → dist/img/addNodeIcon.png View File


dist/UI_icons/backIcon.png → dist/img/backIcon.png View File


dist/UI_icons/connectIcon.png → dist/img/connectIcon.png View File


dist/UI_icons/deleteIcon.png → dist/img/deleteIcon.png View File


+ 8
- 26
dist/vis.js View File

@ -4,8 +4,8 @@
* *
* A dynamic, browser-based visualization library. * A dynamic, browser-based visualization library.
* *
* @version 0.4.0
* @date 2014-01-31
* @version 0.5.0-SNAPSHOT
* @date 2014-02-04
* *
* @license * @license
* Copyright (C) 2011-2014 Almende B.V, http://almende.com * Copyright (C) 2011-2014 Almende B.V, http://almende.com
@ -12970,24 +12970,14 @@ var SelectionMixin = {
delete this.selectionObj[objectId]; delete this.selectionObj[objectId];
} }
} }
<<<<<<< HEAD
else { // assuming only edges and nodes are selected else { // assuming only edges and nodes are selected
if (!this.edges.hasOwnProperty(objectId)) { if (!this.edges.hasOwnProperty(objectId)) {
delete this.selectionObj[objectId]; delete this.selectionObj[objectId];
} }
=======
}
}
else if (this.selection && this.selection.length) {
// remove all selections
for (i = 0, iMax = this.selection.length; i < iMax; i++) {
id = this.selection[i];
if (this.nodes.hasOwnProperty(id)) {
this.nodes[id].unselect();
changed = true;
} }
changed = true;
}
this.selection = []; this.selection = [];
}
} }
if (changed && (triggerSelect == true || triggerSelect == undefined)) { if (changed && (triggerSelect == true || triggerSelect == undefined)) {
@ -12998,8 +12988,9 @@ var SelectionMixin = {
} }
return changed; return changed;
},
*/
}
}
/** /**
* select all nodes on given location x, y * select all nodes on given location x, y
* @param {Array} selection an array with node ids * @param {Array} selection an array with node ids
@ -13031,7 +13022,6 @@ var SelectionMixin = {
} }
<<<<<<< HEAD <<<<<<< HEAD
======= =======
if (changed) { if (changed) {
@ -13040,11 +13030,8 @@ var SelectionMixin = {
nodes: this.getSelection() nodes: this.getSelection()
}); });
} }
return changed;
},
*/
>>>>>>> develop >>>>>>> develop
}; };
@ -14424,15 +14411,10 @@ Graph.prototype.setSize = function(width, height) {
this.frame.canvas.width = this.frame.canvas.clientWidth; this.frame.canvas.width = this.frame.canvas.clientWidth;
this.frame.canvas.height = this.frame.canvas.clientHeight; this.frame.canvas.height = this.frame.canvas.clientHeight;
<<<<<<< HEAD
this.manipulationDiv.style.width = this.frame.canvas.clientWidth; this.manipulationDiv.style.width = this.frame.canvas.clientWidth;
if (this.constants.navigationUI.enabled == true) {
this._relocateUI();
=======
if (this.constants.navigation.enabled == true) { if (this.constants.navigation.enabled == true) {
this._relocateNavigation(); this._relocateNavigation();
>>>>>>> develop
} }
}; };

+ 9
- 9
dist/vis.min.js
File diff suppressed because it is too large
View File


+ 11
- 11
examples/graph/20_UI_example.html View File

@ -78,7 +78,7 @@
} }
span.manipulationUI.back { span.manipulationUI.back {
background-image: url("../../dist/UI_icons/backIcon.png");
background-image: url("../../dist/img/backIcon.png");
} }
span.manipulationUI.none:hover { span.manipulationUI.none:hover {
@ -90,15 +90,15 @@
} }
span.manipulationUI.add { span.manipulationUI.add {
background-image: url("../../dist/UI_icons/addNodeIcon.png");
background-image: url("../../dist/img/addNodeIcon.png");
} }
span.manipulationUI.connect { span.manipulationUI.connect {
background-image: url("../../dist/UI_icons/connectIcon.png");
background-image: url("../../dist/img/connectIcon.png");
} }
span.manipulationUI.delete { span.manipulationUI.delete {
background-image: url("../../dist/UI_icons/deleteIcon.png");
background-image: url("../../dist/img/deleteIcon.png");
} }
/* top right bottom left */ /* top right bottom left */
span.manipulationLabel { span.manipulationLabel {
@ -218,13 +218,13 @@
<table class="legend_table"> <table class="legend_table">
<tr> <tr>
<td>Icons: </td> <td>Icons: </td>
<td><div class="table_content"><img src="img/UI_icons/uparrow.png" /> </div></td>
<td><div class="table_content"><img src="img/UI_icons/downarrow.png" /> </div></td>
<td><div class="table_content"><img src="img/UI_icons/leftarrow.png" /> </div></td>
<td><div class="table_content"><img src="img/UI_icons/rightarrow.png" /> </div></td>
<td><div class="table_content"><img src="img/UI_icons/plus.png" /> </div></td>
<td><div class="table_content"><img src="img/UI_icons/minus.png" /> </div></td>
<td><div class="table_content"><img src="img/UI_icons/zoomExtends.png" /> </div></td>
<td><div class="table_content"><img src="../../dist/img/uparrow.png" /> </div></td>
<td><div class="table_content"><img src="../../dist/img/downarrow.png" /> </div></td>
<td><div class="table_content"><img src="../../dist/img/leftarrow.png" /> </div></td>
<td><div class="table_content"><img src="../../dist/img/rightarrow.png" /> </div></td>
<td><div class="table_content"><img src="../../dist/img/plus.png" /> </div></td>
<td><div class="table_content"><img src="../../dist/img/minus.png" /> </div></td>
<td><div class="table_content"><img src="../../dist/img/zoomExtends.png" /> </div></td>
</tr> </tr>
<tr> <tr>
<td><div class="table_description">Keyboard shortcuts:</div></td> <td><div class="table_description">Keyboard shortcuts:</div></td>

+ 0
- 5
src/graph/Graph.js View File

@ -1126,15 +1126,10 @@ Graph.prototype.setSize = function(width, height) {
this.frame.canvas.width = this.frame.canvas.clientWidth; this.frame.canvas.width = this.frame.canvas.clientWidth;
this.frame.canvas.height = this.frame.canvas.clientHeight; this.frame.canvas.height = this.frame.canvas.clientHeight;
<<<<<<< HEAD
this.manipulationDiv.style.width = this.frame.canvas.clientWidth; this.manipulationDiv.style.width = this.frame.canvas.clientWidth;
if (this.constants.navigationUI.enabled == true) {
this._relocateUI();
=======
if (this.constants.navigation.enabled == true) { if (this.constants.navigation.enabled == true) {
this._relocateNavigation(); this._relocateNavigation();
>>>>>>> develop
} }
}; };

+ 6
- 6
src/graph/SelectionMixin.js View File

@ -501,15 +501,14 @@ var SelectionMixin = {
delete this.selectionObj[objectId]; delete this.selectionObj[objectId];
} }
} }
<<<<<<< HEAD
else { // assuming only edges and nodes are selected else { // assuming only edges and nodes are selected
if (!this.edges.hasOwnProperty(objectId)) { if (!this.edges.hasOwnProperty(objectId)) {
delete this.selectionObj[objectId]; delete this.selectionObj[objectId];
} }
=======
changed = true;
}
changed = true;
}
this.selection = []; this.selection = [];
}
} }
if (changed && (triggerSelect == true || triggerSelect == undefined)) { if (changed && (triggerSelect == true || triggerSelect == undefined)) {
@ -520,8 +519,9 @@ var SelectionMixin = {
} }
return changed; return changed;
},
*/
}
}
/** /**
* select all nodes on given location x, y * select all nodes on given location x, y
* @param {Array} selection an array with node ids * @param {Array} selection an array with node ids

Loading…
Cancel
Save