Merge branch 'master' of https://github.com/processing/p5.js

* 'master' of https://github.com/processing/p5.js:
  fix #1430
  detail warning
  fix illegal trailing whitespace
  Improve example for p5.prototype.focused
  Fix missing entry in documentation
  Fix ellipsoid crashing
  Fix #1438: negative rect arguments in CORNERS mode
  fixes #253
  Using constants for vertical alignment checks
  Code style fix: double quotes to single quotes
  Update leading vertical offset to match processing
  Add manual test for leading with system fonts
  Moved Underscore and Backbone out of reference.js
  Minified data.json and use minified versions of libs

Author: indefinit

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/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;
 
-});
+});

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

@@ -1,15 +1,13 @@
 define([
-  'underscore',
-  'backbone',
   'App',
-  
+
   // Views
   'searchView',
   'listView',
   'itemView',
   'menuView',
   'libraryView'
-], function(_, Backbone, App, searchView, listView, itemView, menuView, libraryView) {
+], function(App, searchView, listView, itemView, menuView, libraryView) {
 
   var pageView = Backbone.View.extend({
     el: 'body',
@@ -26,37 +24,37 @@ define([
      * Render.
      */
     render: function() {
-      
+
       // Menu view
       if (!App.menuView) {
         App.menuView = new menuView();
         App.menuView.init().render();
       }
-      
+
       // Item view
       if (!App.itemView) {
         App.itemView = new itemView();
         App.itemView.init().render();
         // Add the item view to the views array
         App.contentViews.push(App.itemView);
       }
-      
+
       // List view
       if (!App.listView) {
         App.listView = new listView();
         App.listView.init().render();
         // Add the list view to the views array
         App.contentViews.push(App.listView);
       }
-      
+
       // Libary view
       if (!App.libraryView) {
         App.libraryView = new libraryView();
         App.libraryView.init().render();
         // Add the list view to the views array
         App.contentViews.push(App.libraryView);
       }
-      
+
       // Search
       if (!App.searchView) {
         App.searchView = new searchView();
@@ -72,11 +70,11 @@ define([
       _.each(App.contentViews, function(view, i) {
         view.$el.hide();
       });
-      
+
       return this;
     }
   });
 
   return pageView;
 
-});
+});

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

@@ -1,13 +1,11 @@
 define([
-  'underscore',
-  'backbone',
   'App',
   // Templates
   'text!tpl/search.html',
   'text!tpl/search_suggestion.html',
   // Tools
   'typeahead'
-], function(_, Backbone, App, searchTpl, suggestionTpl) {
+], function(App, searchTpl, suggestionTpl) {
 
   var searchView = Backbone.View.extend({
     el: '#search',
@@ -32,7 +30,7 @@ define([
     render: function() {
       // Append the view to the dom
       this.$el.append(this.searchHtml);
-      
+
       // Render Typeahead
       var $searchInput = this.$el.find('input[type=text]');
       this.typeaheadRender($searchInput);
@@ -71,7 +69,7 @@ define([
           var txt = $input.val();
           var f = _.find(self.items, function(it) { return it.name == txt; });
           if (f) {
-            select(f); 
+            select(f);
           }
         } else if (e.which === 27) {
           $input.blur();