Merge remote-tracking branch 'processing/master'

Author: Matthew Kaney

.gitignore

@@ -8,5 +8,5 @@ lib/addons/p5.dom.min.js
 docs/reference/*
 docs/yuidoc-p5-theme/assets/js/reference.js*
 !*.gitkeep
-examples/3d/tutorial
+examples/3d/
 .idea

Gruntfile.js

@@ -332,6 +332,13 @@ module.exports = function(grunt) {
           tags: ['master']
         }
       }
+    },
+    minjson: {
+      compile: {
+        files: {
+          './docs/reference/data.min.json': './docs/reference/data.json'
+        }
+      }
     }
   });
 
@@ -352,15 +359,15 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-release-it');
   grunt.loadNpmTasks('grunt-saucelabs');
   grunt.loadNpmTasks('grunt-mocha-test');
+  grunt.loadNpmTasks('grunt-minjson');
 
   // Create the multitasks.
   // TODO: "requirejs" is in here to run the "yuidoc_themes" subtask. Is this needed?
   grunt.registerTask('build', ['browserify', 'uglify', 'requirejs']);
   grunt.registerTask('test', ['jshint', 'jscs', 'build', 'yuidoc:dev', 'connect', 'mocha', 'mochaTest']);
   grunt.registerTask('test:nobuild', ['jshint:test', 'jscs:test', 'connect', 'mocha']);
-  grunt.registerTask('yui', ['yuidoc:prod']);
-  grunt.registerTask('yui:dev', ['yuidoc:dev']);
-  grunt.registerTask('yui', ['yuidoc:prod']);
+  grunt.registerTask('yui', ['yuidoc:prod', 'minjson']);
+  grunt.registerTask('yui:dev', ['yuidoc:dev', 'minjson']);
   grunt.registerTask('yui:test', ['yuidoc:dev', 'connect', 'mocha:yui']);
   grunt.registerTask('default', ['test']);
   grunt.registerTask('saucetest', ['connect', 'saucelabs-mocha']);

docs/yuidoc-p5-theme-src/scripts/config.js

@@ -28,4 +28,4 @@ var require = {
     'menuView': 'views/menuView',
     'libraryView': 'views/libraryView'
   }
-};
+};

docs/yuidoc-p5-theme-src/scripts/main.js

@@ -8,22 +8,18 @@ define('App', function() {
 
 /**
  * Load json API data and start the router.
- * @param {module} _
- * @param {module} Backbone
  * @param {module} App
  * @param {module} router
  */
 require([
-  'underscore',
-  'backbone',
   'App',
-  './documented-method'], function(_, Backbone, App, DocumentedMethod) {
-  
+  './documented-method'], function(App, DocumentedMethod) {
+
   // Set collections
   App.collections = ['allItems', 'classes', 'events', 'methods', 'properties', 'p5.sound', 'p5.dom'];
 
   // Get json API data
-  $.getJSON("data.json", function(data) {
+  $.getJSON('data.min.json', function(data) {
     App.data = data;
     App.classes = [];
     App.methods = [];
@@ -74,7 +70,7 @@ require([
         } else if (el.itemtype === "event") {
           App.events.push(el);
           App.allItems.push(el);
-        } 
+        }
 
         // libraries
         if (el.module === "p5.sound") {
@@ -88,11 +84,11 @@ require([
         }
       }
     });
-    
+
     _.each(App.classes, function(c, idx) {
       c.items = _.filter(App.allItems, function(it){ return it.class === c.name; });
     });
 
     require(['router']);
   });
-});
+});

docs/yuidoc-p5-theme-src/scripts/router.js

@@ -1,8 +1,6 @@
 define([
-  'underscore',
-  'backbone',
   'App'
-], function(_, Backbone, App) {
+], function(App) {
 
   'use strict'; //
 

docs/yuidoc-p5-theme-src/scripts/tpl/menu.html

@@ -1,3 +1,10 @@
+<p>
+  <small>
+    Can't find what you're looking for? You may want to check out
+    <a href="#/libraries/p5.dom">p5.dom</a> or
+    <a href="#/libraries/p5.sound">p5.sound</a>.
+  </small>
+</p>
 
 <% var i=0; %>
 <% var max=Math.floor(groups.length/4); %>

docs/yuidoc-p5-theme-src/scripts/views/itemView.js

@@ -1,14 +1,12 @@
 define([
-  'underscore',
-  'backbone',
   'App',
   // Templates
   'text!tpl/item.html',
   'text!tpl/class.html',
   'text!tpl/itemEnd.html',
   // Tools
   'prettify'
-], function (_, Backbone, App, itemTpl, classTpl, endTpl) {
+], function (App, itemTpl, classTpl, endTpl) {
 
   'use strict';
 
@@ -34,7 +32,7 @@ define([
       if (isMethod || isConstructor) {
         syntax += '(';
         if (cleanItem.params) {
-          for (var i=0; i<cleanItem.params.length; i++) { 
+          for (var i=0; i<cleanItem.params.length; i++) {
             var p = cleanItem.params[i];
             if (p.optional) syntax += '[';
             syntax += p.name;
@@ -172,4 +170,4 @@ define([
 
   return itemView;
 
-});
+});

docs/yuidoc-p5-theme-src/scripts/views/libraryView.js

@@ -1,10 +1,8 @@
 define([
-  'underscore',
-  'backbone',
   'App',
   // Templates
   'text!tpl/library.html'
-], function (_, Backbone, App, libraryTpl) {
+], function (App, libraryTpl) {
 
   var libraryView = Backbone.View.extend({
     el: '#list',
@@ -108,4 +106,4 @@ define([
 
   return libraryView;
 
-});
+});

docs/yuidoc-p5-theme-src/scripts/views/listView.js

@@ -1,10 +1,8 @@
 define([
-  'underscore',
-  'backbone',
   'App',
   // Templates
   'text!tpl/list.html'
-], function (_, Backbone, App, listTpl) {
+], function (App, listTpl) {
   var striptags = function(html) {
     var div = document.createElement('div');
     div.innerHTML = html;

docs/yuidoc-p5-theme-src/scripts/views/menuView.js

@@ -1,9 +1,7 @@
 define([
-  'underscore',
-  'backbone',
   'App',
   'text!tpl/menu.html'
-], function(_, Backbone, App, menuTpl) {
+], function(App, menuTpl) {
 
   var menuView = Backbone.View.extend({
     el: '#collection-list-nav',
@@ -20,7 +18,7 @@ define([
      * @returns {object} This view.
      */
     render: function() {
-    
+
       var groups = [];
       _.each(App.modules, function (item, i) {
         if (!item.is_submodule) {
@@ -64,4 +62,4 @@ define([
 
   return menuView;
 
-});
+});