Merge pull request #369 from MDCox/v0.2.1

Final 0.2.1 documentation tweaks

Author: mdcox-sdm

site/app/docs/_configDocs/Edges.md

@@ -7,6 +7,8 @@ title: Edges
 
 <p></p>
 
+By default, edges do not require an ID, only a source and target.  If, however, there are multiple edges that share the same source and target, a unique ID will be required.
+
 ##### edgeCaption
 
 [`string`] default:`'caption'` 

site/app/docs/_documentation/GraphJSON.md

@@ -21,7 +21,7 @@ GraphJSON is a JSON object that contains two objects, **nodes** and **edges**:
 The **nodes** and **edges** objects are arrays of the individual nodes and edges that will be represented in the Graph visualization.   
 
 ## Nodes and Edges
-The only requirement for node objects is that they receive an **id** key that is unique (in the scope of the GraphJSON). The only requirement for edge objects is that they receive a **source** and **target** key that correspond to the source and target nodes.
+The only requirement for node objects is that they receive an **id** key that is unique (in the scope of the GraphJSON). The only requirement for edge objects is that they receive a **source** and **target** key that correspond to the source and target nodes. If there are multiple edges with identical source and targets, those edges MUST have a unique id.
 
 ## Features
 Alchemy.js has a number of features that rely on the underlying data.  Most of the below features are supported by the example GraphJSON that follows.

site/app/docs/js/coffee/docs.coffee

@@ -32,49 +32,23 @@ $ ->
         activeItem = window.location.hash || "#Start"
         targetItem = "a[href='#{activeItem}']"
         activate(targetItem, false)
-    
+
     $(".section-bar a")
         .on 'click', () ->
             activate(@, true)
 
-    scrollActivate = (tocEl) ->
-        padding = 50 - 15 
-        offset = $("#sidebar").offset().top - padding
-        if $(tocEl).hasClass("active")
-                $("#pointer").removeClass("hidden")
-                $(tocEl)
-                    .parents(".level-3, .level-2, .level-1, .section-bar")
-                        .removeClass("hidden")
-                        .addClass("active")
-                $(tocEl)
-                    .siblings("a.level-1, a.level-2, a.level-3")
-                        .removeClass("active")
-
-            else if !$(tocEl).hasClass("active")
-                $("#pointer").addClass("hidden")
-                $(tocEl)
-                    .parents(".level-3,  .level-2, .level-1, .section-bar")
-                        .removeClass("active")
-                $(tocEl)
-                    .siblings("a.level-1, a.level-2, a.level-3")
-                        .removeClass("active")
-
-            pos =  $(tocEl).offset().top - offset 
-            $("#sidebar-wrapper").scrollTop(pos)
-
     activate = (tocEl, click) ->
-        # event.preventDefault()
-        # net additional padding from sidebar wrapper and <a> elements
         if $(tocEl).length
             padding = 50 - 15 
             offset = $("#sidebar").offset().top - padding
 
-            $("#sidebar").find('.active').removeClass("active")
-            # $(tocEl).parents(".section-bar").find(".level-2").removeClass("hidden")
-
             if $(tocEl).hasClass("level-1")
+                if $(tocEl).hasClass("active")
+                    # Stop href link.
+                    event.preventDefault()
+
+                $(tocEl).toggleClass("active")
                 if click
-                    $(tocEl).toggleClass("active")
                     $(tocEl).parent().children(".level-2")
                         .toggleClass("hidden", () ->
                             if $(tocEl).hasClass(".active")
@@ -83,8 +57,8 @@ $ ->
                                 true
                         )
                     $(tocEl).parent().find("div.level-3").addClass("hidden")
-                else  $(tocEl).addClass("active")
-
+                else
+                    $(tocEl).addClass("active")
 
             else if $(tocEl).hasClass("level-2")
                 if $(tocEl).next().hasClass("level-3")
@@ -129,4 +103,4 @@ $ ->
                         .removeClass("active")
 
             pos =  $(tocEl).offset().top - offset 
-            $("#sidebar-wrapper").scrollTop(pos)
+            $("#sidebar-wrapper").scrollTop(pos)