Merge pull request #973 from roots/jquery_nc

JS wrap, better comments

assets/js/_main.js

@@ -4,8 +4,20 @@
  *
  * Only fires on body classes that match. If a body class contains a dash,
  * replace the dash with an underscore when adding it to the object below.
+ *
+ * .noConflict()
+ * The routing is enclosed within an anonymous function so that you can 
+ * always reference jQuery with $, even when in .noConflict() mode.
+ *
+ * Google CDN, Latest jQuery
+ * To use the default WordPress version of jQuery, go to lib/config.php and
+ * remove or comment out: add_theme_support('jquery-cdn');
  * ======================================================================== */
 
+(function($) {
+
+// Use this variable to set up the common and page specific functions. If you 
+// rename this variable, you will also need to rename the namespace below.
 var Roots = {
   // All pages
   common: {
@@ -19,14 +31,16 @@ var Roots = {
       // JavaScript to be fired on the home page
     }
   },
-  // About page
-  about: {
+  // About us page, note the change from about-us to about_us.
+  about_us: {
     init: function() {
-      // JavaScript to be fired on the about page
+      // JavaScript to be fired on the about us page
     }
   }
 };
 
+// The routing fires all common scripts, followed by the page specific scripts.
+// Add additional events for more control over timing e.g. a finalize event
 var UTIL = {
   fire: function(func, funcname, args) {
     var namespace = Roots;
@@ -45,3 +59,5 @@ var UTIL = {
 };
 
 $(document).ready(UTIL.loadEvents);
+
+})(jQuery); // Fully reference jQuery after this point.