fixed merge

dist/vis.js

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

examples/graph/20_UI_example.html

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

src/graph/Graph.js

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

src/graph/SelectionMixin.js

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