Merge pull request jquery#93 from jquery/86/91

ajpiano · ajpiano · commit 58cb7bec240b · 2012-03-22T15:41:51.000-07:00
Combines Using jQuery Core and jQuery Basics into a single chapter, merge types content into a single article.
diff --git a/Rules b/Rules
@@ -86,7 +86,6 @@ preprocess do
   @chapterOrder = [
     "getting-started",
     "javascript-101",
-    "jquery-basics",
     "using-jquery-core",
     "events",
     "effects",
diff --git a/content/javascript-101/types.md b/content/javascript-101/types.md
@@ -161,7 +161,28 @@ alert(foo.length);
 
 There are many more methods for manipulating arrays, details can be found on the [MDN Document](https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array "MDN - Array Reference")
 
+## Type Checking With jQuery
 
+jQuery offers a few basic utility methods for determining the type of a
+specific value.
+
+<javascript caption="Checking the type of an arbitrary value">
+var myValue = [1, 2, 3];
+
+// Using JavaScript's typeof operator to test for primative types
+typeof myValue == 'string'; // false
+typeof myValue == 'number'; // false
+typeof myValue == 'undefined'; // false
+typeof myValue == 'boolean'; // false
+
+// Using strict equality operator to check for null
+myValue === null; // false
+
+// Using jQuery's methods to check for non-primative types
+jQuery.isFunction(myValue); // false
+jQuery.isPlainObject(myValue); // false
+jQuery.isArray(myValue); // true
+</javascript>
 
 
 
diff --git a/content/jquery-basics/dex.md b/content/jquery-basics/dex.md
diff --git a/content/using-jquery-core/attributes.md b/content/using-jquery-core/attributes.md
@@ -1,5 +1,6 @@
 ---
-chapter : jquery-basics
+chapter : using-jquery-core
+level   : beginner
 section : 4
 title   : Attributes
 ---
diff --git a/content/using-jquery-core/avoid-conflicts-other-libraries.md b/content/using-jquery-core/avoid-conflicts-other-libraries.md
@@ -1,5 +1,6 @@
 ---
-chapter : jquery-core
+chapter : using-jquery-core
+level: beginner
 section : 6
 title   : Avoiding Conflicts with Other Libraries
 attribution:  jQuery Fundamentals
diff --git a/content/using-jquery-core/checking-types.md b/content/using-jquery-core/checking-types.md
diff --git a/content/using-jquery-core/css-styling-dimensions.md b/content/using-jquery-core/css-styling-dimensions.md
@@ -1,5 +1,6 @@
 ---
-chapter : jquery-basics"
+chapter : using-jquery-core
+level: beginner
 section : 3
 title   : CSS, Styling, & Dimensions
 ---
diff --git a/content/using-jquery-core/data-methods.md b/content/using-jquery-core/data-methods.md
@@ -3,6 +3,7 @@ chapter : jquery-core
 section : 4
 title   : Data Methods
 attribution:  jQuery Fundamentals
+level: intermediate
 ---
 As your work with jQuery progresses, you'll find that there's often data about
 an element that you want to store with the element.  In plain JavaScript, you
diff --git a/content/using-jquery-core/document-ready.md b/content/using-jquery-core/document-ready.md
@@ -1,5 +1,6 @@
 ---
 chapter : jquery-basics
+level: beginner
 section : 1
 title   : $(document).ready()
 ---
@@ -63,4 +64,4 @@ Lets take a look at how both the events act. The below example tries to load som
     	</body>
     </html>
   
-</javascript>
+</javascript>
diff --git a/content/using-jquery-core/dollar-object-vs-function.md b/content/using-jquery-core/dollar-object-vs-function.md
@@ -1,8 +1,9 @@
 ---
-chapter : jquery-core
+chapter : using-jquery-core
 section : 1
 title   : $ vs $()
 attribution:  jQuery Fundamentals
+level: beginner
 ---
 Until now, we’ve been dealing entirely with methods that are called on a jQuery
 object. For example:
diff --git a/content/using-jquery-core/exercises.md b/content/using-jquery-core/exercises.md
diff --git a/content/using-jquery-core/feature-browser-detection.md b/content/using-jquery-core/feature-browser-detection.md
@@ -1,7 +1,8 @@
 ---
-chapter : jquery-core
+chapter : using-jquery-core
 section : 5
 title   : Feature & Browser Detection
+level: intermediate
 attribution:  jQuery Fundamentals
 ---
 ## Feature & Browser Detection
diff --git a/content/using-jquery-core/manipulating-elements.md b/content/using-jquery-core/manipulating-elements.md
@@ -1,8 +1,9 @@
 ---
-chapter : jquery-basics
+chapter : using-jquery-core
 section : 6
 title   : Manipulating Elements
 attribution:  jQuery Fundamentals
+level: beginner
 ---
 Once you've made a selection, the fun begins. You can change, move, remove, and clone elements. 
 You can also create new elements via a simple syntax.
diff --git a/content/using-jquery-core/selecting-elements.md b/content/using-jquery-core/selecting-elements.md
@@ -1,7 +1,8 @@
 ---
-chapter : jquery-basics
+chapter : using-jquery-core
 section : 2
 title   : Selecting Elements
+level: beginner
 ---
 
 The most basic concept of jQuery is to “select some elements and do something with
diff --git a/content/using-jquery-core/traversing.md b/content/using-jquery-core/traversing.md
@@ -1,7 +1,8 @@
 ---
-chapter : jquery-basics
+chapter : using-jquery-core
 section : 5
 title   : Traversing
+level: beginner
 ---
 ## Traversing
 
diff --git a/content/using-jquery-core/utility-methods.md b/content/using-jquery-core/utility-methods.md
@@ -1,8 +1,9 @@
 ---
-chapter : jquery-core
+chapter : using-jquery-core
 section : 2
 title   : Utility Methods
 attribution:  jQuery Fundamentals
+level: beginner
 ---
 jQuery offers several utility methods in the $ namespace.  These methods are
 helpful for accomplishing routine programming tasks.  Below are examples of a
diff --git a/content/using-jquery-core/working-with-selections.md b/content/using-jquery-core/working-with-selections.md
@@ -1,7 +1,8 @@
 ---
-chapter : jquery-basics
+chapter : using-jquery-core
 section : 3
 title   : Working with Selections
+level: beginner
 ---
 Once you have a selection, you can call methods on the selection. 
 Methods generally come in two different flavors: getters and setters. 
