Merge branch 'master' into master

Author: lmccart

Gruntfile.js

@@ -83,8 +83,8 @@ module.exports = function(grunt) {
         options: {
           expand: true,
           flatten: true,
-          helpers: ['<%= config.src %>/assets/js/translation.js'],
           assets: '<%= config.dist %>/assets',
+          helpers: ['<%= config.src %>/assets/js/translation.js', '<%= config.src %>/assets/js/cache-busting.js'],
           layout: '<%= config.src %>/templates/layouts/default.hbs',
           data: [
             '<%= config.src %>/data/**/*.{json,yml}',
@@ -408,10 +408,11 @@ module.exports = function(grunt) {
     'update-version',
     'exec',
     'clean',
+    'requirejs:yuidoc_theme',
     'requirejs',
     'copy',
-    'assemble',
     'optimize',
+    'assemble',
     'file_append',
     'compress',
     'i18n',

i18n-tracking.yml

@@ -4,6 +4,7 @@ es:
     line 721: '  project-a-1-4-phuong'
     line 727: '  project-a-2-5-phuong'
     line 730: '  project-a-2-7-phuong'
+    line 480: '  notes3'
     line 44: '  description-roni'
     line 45: '  project-phuong'
     line 17: Showcase
@@ -174,8 +175,6 @@ es:
     line 551: '  credit-moon-xin'
     line 552: '  description-moon-xin'
     line 669: '  credit-moon-xin'
-    line 670: ''
-    line 671: ''
     line 672: '  created-by'
     line 673: '  pronouns-female'
     line 674: '  creator-from-roni-cantor'
@@ -298,6 +297,14 @@ zh-Hans:
     line 721: '  project-a-1-4-phuong'
     line 727: '  project-a-2-5-phuong'
     line 730: '  project-a-2-7-phuong'
+    line 481: '  notes1'
+    line 482: '  notes2'
+    line 483: '  notes3'
+    line 484: '  notes4'
+    line 485: '  notes5'
+    line 608: '  book-1-authors'
+    line 617: '  book-2-authors'
+    line 409: '  p5.bots'
     line 44: '  description-roni'
     line 45: '  project-phuong'
     line 17: Showcase
@@ -395,8 +402,6 @@ zh-Hans:
     line 551: '  credit-moon-xin'
     line 552: '  description-moon-xin'
     line 669: '  credit-moon-xin'
-    line 670: ''
-    line 671: ''
     line 672: '  created-by'
     line 673: '  pronouns-female'
     line 674: '  creator-from-roni-cantor'

offline-reference/extra/index.html

@@ -86,7 +86,6 @@
 
     <script src="./js/p5.min.js"></script>
     <script src="./js/p5.sound.min.js"></script>
-    <script src="./js/p5.dom.min.js"></script>
     <script src="./js/render.js"></script>
     <!-- prism for code highlighting -->
     <script src="./js/vendor/prism.js"></script>

offline-reference/extra/js/reference.js

@@ -4595,7 +4595,7 @@ define('router',[
     get: function(searchClass, searchItem) {
 
       // if looking for a library page, redirect
-      if ((searchClass === 'p5.dom' || searchClass === 'p5.sound')
+      if (searchClass === 'p5.sound')
           && !searchItem) {
         window.location.hash = '/libraries/'+searchClass;
         return;
@@ -4743,7 +4743,7 @@ require([
   './documented-method'], function(App, DocumentedMethod) {
 
   // Set collections
-  App.collections = ['allItems', 'classes', 'events', 'methods', 'properties', 'p5.sound', 'p5.dom'];
+  App.collections = ['allItems', 'classes', 'events', 'methods', 'properties', 'p5.sound'];
 
   // Get json API data
   var data = referenceData;
@@ -4767,9 +4767,6 @@ require([
     if (m.name == "p5.sound") {
       App.sound.module = m;
     }
-    else if (m.name == "p5.dom") {
-      App.dom.module = m;
-    }
   });
 
 
@@ -4803,12 +4800,6 @@ require([
       if (el.module === "p5.sound") {
         App.sound.items.push(el);
       }
-      else if (el.module === "p5.dom" || el.module === 'DOM') {
-        if (el.class === 'p5.dom') {
-          el.class = 'p5';
-        }
-        App.dom.items.push(el);
-      }
     }
   });
 

src/assets/css/main.css

@@ -441,6 +441,14 @@ div.reference-subgroup {
   margin: 1em 0 0 0;
 }
 
+#item ul {
+  margin-top: 0.5em;
+}
+
+#item li {
+  margin-bottom: 1em;
+}
+
 .description {
   clear: both;
   display: block;
@@ -455,7 +463,8 @@ div.reference-subgroup {
 
 .paramname {
   display: inline-block;
-  width: 8em;
+  min-width: 25%;
+  margin-right: 1%;
   font-size: 1.2em;
 }
 
@@ -467,7 +476,7 @@ div.reference-subgroup {
 .paramtype {
   display: inline-block;
   font-size: 1.2em;
-  width: 20em;
+  width: 73%;
   vertical-align: top;
 }
 
@@ -939,6 +948,14 @@ h3 {
   margin: 1em 0 0 0;
 }
 
+.label .nounderline img {
+  height: fit-content;
+}
+
+#learn-page .info {
+  display: inline-block;
+}
+
 #exampleDisplay,
 #exampleFrame,
 #exampleEditor {
@@ -2267,6 +2284,9 @@ footer {
   footer {
     font-size: 0.5em;
   }
+  .paramtype {
+    width: 96%;
+  }
 }
 
 @media (max-width:400px) {
@@ -2414,15 +2434,15 @@ iframe {
 
 #get-started-page #asterisk-design-element,
 #community-page #asterisk-design-element {
-  top: -30%;
-  right: -40%;
-  height: 44em;
-  width: 44em;
-  -webkit-transform: rotate(9deg);
-  -moz-transform: rotate(9deg);
-  -ms-transform: rotate(9deg);
-  -o-transform: rotate(9deg);
-  transform: rotate(9deg);
+  top: 10%;
+  right: -20%;
+  height: 30em;
+  width: 30em;
+  -webkit-transform: rotate(2deg);
+  -moz-transform: rotate(2deg);
+  -ms-transform: rotate(2deg);
+  -o-transform: rotate(2deg);
+  transform: rotate(2deg);
 }
 
 #reference-page #asterisk-design-element,

src/assets/img/books/generative_design.jpg

@@ -0,0 +1,22 @@
+module.exports.register = function(Handlebars, options) {
+  Handlebars.registerHelper('versionedAsset', function(options) {
+    // node libraries
+    const crypto = require('crypto');
+    const path = require('path');
+    const fs = require('fs');
+    const filePath = options.fn(this);
+    const hash = crypto.createHash('sha256');
+    // creating full path from the root dir to the file
+    const fullPath = path.join(__dirname, "../../..", "dist", filePath);
+    let hashCode = "";
+    hash.on('readable', () => {
+      const data = hash.read();
+      if (data) hashCode = data.toString('hex');
+    })
+    hash.write(fs.readFileSync(fullPath, function (err) { if (err) return 0 }).toString());
+    hash.end();
+    // creating a version string from first 6 hash characters
+    hashCode = "/" + filePath + "?v=" + hashCode.substr(0, 6);
+    return hashCode;
+  });
+};

src/assets/img/books/generative_gestaltung.jpg

@@ -152,13 +152,18 @@ var renderCode = function(exampleName) {
           edit_area.style.display = 'block';
           edit_area.focus();
         } else {
-          $('.example_container').each(function(ind, con) {
-            $(con).css('opacity', 1.0);
-            $(con).removeClass('editing');
-          });
           edit_button.innerHTML = 'edit';
           edit_area.style.display = 'none';
           sketch.textContent = edit_area.value;
+          $('.example_container').each(function (ind, con) {
+            $(con).css('opacity', 1.0);
+            $(con).removeClass('editing');
+            $this = $(this);
+            var pre = $this.find('pre')[0];
+            if (pre) {
+              $this.height(Math.max($(pre).height(), 100) + 20);
+            }
+          });
           runCode(sketch, true, i);
         }
       }