Merge branch 'master' into sticky

Author: arichiv-usds

.ruby-version

@@ -1 +1 @@
-2.5.0
+2.5.1

.travis.yml

@@ -7,6 +7,7 @@ env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 before_install:
 - gem update --system
+- gem install bundler
 script:
 - ./build
 before_deploy:

Gemfile

@@ -1,4 +1,4 @@
-ruby '2.5.0'
+ruby '2.5.1'
 
 source 'https://rubygems.org'
 

Gemfile.lock

@@ -8,9 +8,9 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.5)
+    activesupport (5.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
@@ -97,7 +97,7 @@ DEPENDENCIES
   uswds-jekyll!
 
 RUBY VERSION
-   ruby 2.5.0p0
+   ruby 2.5.1p57
 
 BUNDLED WITH
    1.16.1

_pages/getting-started.md

@@ -56,7 +56,7 @@ tree-nodes:
       - text: "No"
         link: contract
 
-  - title: ""
+  - title: Contract Complete
     id: contract-complete
     content: |
       Since the project has been completed, you should have received final delivery. What's key now is how that delivery was made: did you receive all of the source code, including any testing resources, build artifacts, documentation, etc? Or did you only receive a final built product?
@@ -69,7 +69,7 @@ tree-nodes:
 
       <a href='/how-to-open-source.html' class='usa-button'>How to Open Source</a>
 
-  - title: Two Options
+  - title: Contract In-progress
     id: contract
     content: |
       You should **review your contract** to see how delivery of the final product is expected. What we'd like to see is that delivery will be of all source code, development operations and testing code and artifacts, build code and artifacts, etc. If the contractor is only expected to deliver a working product then you might not get access to the code at all.
@@ -80,7 +80,7 @@ tree-nodes:
 
       There are a lot of possibilities within those options, however. We encourage you to read our [frequently asked questions](/frequently-asked-questions.html) and then reach out to us by email at [{{site.email}}](mailto:{{site.email}}) to continue the conversation.
 
-  - title: ""
+  - title: Gov Only
     id: gov-only
     content: |
       Awesome! We're really happy to hear about all the great things that the DoD is doing on a regular basis. You may not be aware, but most code produced by a U.S. federal employee within the scope of their employment does not have copyright protections in the U.S. and certain foreign jurisdictions. In the U.S., creative works (like code) without copyright protections are sometimes referred to as "public domain." Not all countries recognize the concept of public domain, and many countries actually recognize copyright protections for code written by U.S. federal employees.
@@ -93,7 +93,7 @@ tree-nodes:
 
       <a href='/how-to-open-source.html' class='usa-button'>How to Open Source</a>
 
-  - title: ""
+  - title: Gov and Contractor
     id: mixed-code
     content: |
       Great! We understand that partnering with the private sector is how most project development happens in the DoD. You may still be able to open source the resulting code for the project depending on the U.S. federal government's data rights in the contract! The key is to **identify any pieces of the code that are proprietary to the contractor or otherwise restricted from public disclosure**. If there are such pieces then you may need to segment those so that you don't violate the license terms in the contract. That said, if you have Unlimited Rights in segregable portions of the code, you should be able to follow the Code.mil guideline for open sourcing that code!
@@ -106,7 +106,7 @@ tree-nodes:
 
       <a href='/how-to-open-source.html' class='usa-button'>How to Open Source</a>
 
-  - title: ""
+  - title: Not yet
     id: info-only
     content: |
       That's great! We're glad you are interested in open source. You may want to start by reading our [Why Open Source](/why-open-source.html) page and some of the [Frequently Asked Questions](/frequently-asked-questions.html). You can also explore information on the OMB policy itself over on the [Code.gov](https://code.gov) website.

assets/js/main.js

@@ -82,46 +82,77 @@
     }
 
     var nodes = find('.tree-node', tree);
-    nodes[0].classList.add('active');
+    var hashHistory = [];
 
+    // Pull tree history from hash
+    function updateHashHistory() {
+      hashHistory = window.location.hash.replace('#','').split('!');
+      if (hashHistory.length == 1) {
+        hashHistory = ["tree-node-start"];
+      }
+    }
+
+    // Update tree to reflect hash state
+    function renderTree() {
+      updateHashHistory();
+      var treeNodes = nodes.filter(function(n) {
+        return n.classList && n.classList.contains('tree-node');
+      });
+      for (var i = 0; i < treeNodes.length; i++) {
+        var node = treeNodes[i];
+        if (hashHistory.includes(node.getAttribute('id'))) {
+          node.classList.add('active');
+        } else {
+          node.classList.remove('active');
+        }
+        var childNodes = Array.prototype.concat.apply([], node.childNodes);
+        var childNode = childNodes.filter(function(n) {
+          return n.classList && n.classList.contains('tree-node-options');
+        })[0];
+        if (!childNode) {
+          continue;
+        }
+        if (hashHistory[hashHistory.length - 1] == node.getAttribute('id')) {
+          childNode.classList.remove('hidden');
+        } else {
+          childNode.classList.add('hidden');
+        }
+      }
+      if (hashHistory.length > 1) {
+        var node = document.getElementById(hashHistory[hashHistory.length - 1]);
+        node.scrollIntoView({
+          behavior: "smooth"
+        });
+      }
+    }
+
+    // Render tree as it is now
+    renderTree();
+
+    // Re-render tree each time the hash changes
+    window.addEventListener("hashchange", function() {
+      renderTree();
+    });
+
+    // Update hash each time the tree is clicked
     tree.addEventListener('click', function treeNodeButtonClick(e) {
       if (!e.target.classList.contains('tree-link')) {
         return;
       }
-
       e.preventDefault();
-
       var node = nodes.filter(function(n) {
         return n.getAttribute('id') === e.target.getAttribute('href').substr(1);
       })[0];
       if (node) {
-        node.classList.add('active');
-        node.scrollIntoView({
-          behavior: "smooth"
-        });
-        var answer = document.createElement('p');
-        answer.classList.add('tree-node-answer');
-        answer.innerText = e.target.innerText;
-        e.target.parentNode.parentNode.appendChild(answer);
-        e.target.parentNode.classList.add('hidden');
+        hashHistory.push(node.getAttribute('id'));
+        window.location.hash = hashHistory.join("!");
       }
     });
 
+    // support reset
     tree.querySelector('a.tree-reset').addEventListener('click', function treeNodeButtonClick(e) {
       e.preventDefault();
-      nodes.forEach(function(n, i) {
-        if (i === 0) {
-          return;
-        }
-        n.classList.remove('active');
-      });
-      find('.tree-node-options', tree).forEach(function(n) {
-        n.classList.remove('hidden');
-      });
-      find('.tree-node-answer', tree).forEach(function(n) {
-        n.parentNode.removeChild(n);
-      });
+      window.location.hash = "";
     });
   })();
-
 })();