jquery · ajpiano · Mar 23, 2012 · Mar 22, 2012 · Mar 23, 2012 · Mar 23, 2012
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 output/
 tmp/*
 tmp
+order.json
 .DS_Store
diff --git a/Rules b/Rules
@@ -83,25 +83,18 @@ end
 Nanoc3::Filter.register 'CodeBlocks',        :code_blocks
 
 preprocess do
-  @chapterOrder = [
-    "getting-started",
-    "javascript-101",
-    "using-jquery-core",
-    "events",
-    "effects",
-    "ajax",
-    "plugins",
-    "performance",
-    "code-organization",
-    "how-to"
-  ]
-
+  @order = YAML.load(File.read("order.yaml"))
+  @chapter_articles = {}
+  @chapter_order = @order.map{ |chapter| 
+    @chapter_articles[ chapter.keys.first ] = chapter[ chapter.keys.first ]
+    chapter.keys.first
+  }
   @chapters = {}
-
   @github_users = {
     "jquery" =>  nil
   }
 
+  File.open("order.json", "w") {|f| f.write @order.to_json }
   @items.each do |item|
     item[:chapter] = item[:filename].split('/')[1] 
     item[:chapter_title] = item[:chapter].gsub(/-/, " ").upcase
@@ -118,25 +111,25 @@ preprocess do
     @github_users[ username ] = JSON.parse(request.body_str)
   end
 
+  @grouped_items = @items.group_by {|item| item[:chapter]}
 
-  @groupedItems = @items.group_by {|item| item[:chapter]}
-
-  @orderedItems = []
+  @ordered_items = []
 
-  @chapterOrder.each do |folder|
-    myitems = @groupedItems[ folder ]
+  @chapter_order.each do |folder|
     @chapters [ folder] = {}
-    @chapters[ folder ][ :items ] = @groupedItems[folder].sort_by {|i| i[:section] || 0 }
-    @orderedItems = @orderedItems + @chapters[ folder ][ :items ]
+    @chapters[ folder ][ :items ] = @grouped_items[folder].sort_by {|i| 
+      p @chapter_articles[ i[ :chapter ] ].index( p i.identifier.split('/')[2] ) || 0
+      @chapter_articles[ i[ :chapter ] ].index( p i.identifier.split('/')[2] ) || 0
+    }
+    @ordered_items = @ordered_items + @chapters[ folder ][ :items ]
     @chapters[ folder ][ :title ] = folder.gsub(/-/, " ").upcase
     @chapters[ folder ][ :folder ] = folder
   end
-
   @items.each do |item|
-    i = item[:ordinal_index] = @orderedItems.index(item)
+    i = item[:ordinal_index] = @ordered_items.index(item)
     if i
-      item[:next_item] = @orderedItems[ i+1 ]
-      item[:previous_item] = @orderedItems[ i-1 ]
+      item[:next_item] = @ordered_items[ i+1 ]
+      item[:previous_item] = @ordered_items[ i-1 ]
     end
     item[:github_user] = @github_users[ item[:github] ]
   end

diff --git a/content/getting-started/dex.md → content/about-jquery/dex.md b/content/getting-started/dex.md → content/about-jquery/dex.md
@@ -1,6 +1,5 @@
 --- 
-title: Getting Started
-index: true
+title: About jQuery
 ---
 
 Getting started with jQuery can be easy or challenging, depending on 

diff --git a/...ent/getting-started/downloading-jquery.md → content/about-jquery/downloading-jquery.md b/...ent/getting-started/downloading-jquery.md → content/about-jquery/downloading-jquery.md
diff --git a/content/getting-started/how-jquery-works.md → content/about-jquery/how-jquery-works.md b/content/getting-started/how-jquery-works.md → content/about-jquery/how-jquery-works.md
diff --git a/content/ajax/ajax-and-forms.md b/content/ajax/ajax-and-forms.md
@@ -1,9 +1,6 @@
 ---
-chapter : ajax
-section : 4
 title   : Ajax and Forms
 attribution:  jQuery Fundamentals
-
 ---
 
 jQuery’s ajax capabilities can be especially useful when dealing with forms. There are several advantages, which can range from serialization, to simple client-side validation (e.g. "Sorry, that username is taken"), to [prefilters](http://api.jquery.com/extending-ajax/#Prefilters) (explained below), and even more!
@@ -88,4 +85,4 @@ You can pass in an optional argument before the callback function that specifies
 $.ajaxPrefilter( "json script", function( options, originalOptions, jqXHR ) {
 	// do all of the prefiltering here, but only for requests that indicate a dataType of "JSON" or "script"
 })
-</javascript>
+</javascript>
diff --git a/content/ajax/ajax-events.md b/content/ajax/ajax-events.md
@@ -1,6 +1,4 @@
 ---
-chapter : ajax
-section : 6
 title   : Ajax Events
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/ajax/ajax-excercises.md b/content/ajax/ajax-excercises.md
@@ -1,6 +1,4 @@
 ---
-chapter : ajax
-section : 7
 title   : Exercises
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/ajax/jquery-ajax-methods.md b/content/ajax/jquery-ajax-methods.md
@@ -1,6 +1,4 @@
 ---
-chapter : ajax
-section : 3
 title   : jQuery's Ajax-Related Methods
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/ajax/key-concepts.md b/content/ajax/key-concepts.md
@@ -1,6 +1,4 @@
 ---
-chapter : ajax
-section : 2
 title   : Key Concepts
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/ajax/working-with-jsonp.md b/content/ajax/working-with-jsonp.md
@@ -1,6 +1,4 @@
 ---
-chapter : ajax
-section : 5
 title   : Working with JSONP
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/code-organization/beware-anonymous-functions.md b/content/code-organization/beware-anonymous-functions.md
@@ -1,6 +1,4 @@
 ---
-chapter :     code-organization
-section:      2
 title:        Beware Anonymous Functions
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/code-organization/concepts.md b/content/code-organization/concepts.md
@@ -1,6 +1,4 @@
 ---
-chapter :     Code Organization
-section:      0
 title:        Code Organization Concepts
 attribution:  $jQuery Fundamentals
 ---

diff --git a/content/code-organization/dont-repeat-yourself.md b/content/code-organization/dont-repeat-yourself.md
@@ -1,6 +1,4 @@
 ---
-chapter :     code-organization
-section:      0
 title:        Keep Things DRY
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/effects/built-in-effects.md b/content/effects/built-in-effects.md
@@ -1,6 +1,4 @@
 ---
-chapter : effects
-section : 2
 title   : Built-in Effects
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/effects/custom-effects.md b/content/effects/custom-effects.md
@@ -1,6 +1,4 @@
 ---
-chapter : effects
-section : 3
 title   : Custom Effects with $.fn.animate
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/effects/effects-exercises.md b/content/effects/effects-exercises.md
@@ -1,6 +1,4 @@
 ---
-chapter : effects
-section : 5
 title   : Effect Exercises
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/effects/managing-effects.md b/content/effects/managing-effects.md
@@ -1,6 +1,4 @@
 ---
-chapter : effects
-section : 4
 title   : Managing Effects
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/events/dex.md b/content/events/dex.md
@@ -1,6 +1,5 @@
 ---
 title: Events
-section : 1
 attribution:  jQuery Fundamentals
 ---
 jQuery provides simple methods for attaching event handlers to selections.

diff --git a/content/events/event-delegation.md b/content/events/event-delegation.md
@@ -1,6 +1,4 @@
 ---
-chapter : events
-section : 4
 title   : Increasing Performance with Event Delegation
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/events/event-exercises.md b/content/events/event-exercises.md
@@ -1,6 +1,4 @@
 ---
-chapter : events
-section : 6
 title   : Excercises
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/events/event-extensions.md b/content/events/event-extensions.md
@@ -1,6 +1,4 @@
 ---
-chapter : events
-section : 7
 title   : jQuery Event Extensions
 attribution:  Dave Methvin
 github: dmethvin

diff --git a/content/events/event-helpers.md b/content/events/event-helpers.md
@@ -1,6 +1,4 @@
 ---
-chapter : events
-section : 5
 title   : Event Helpers
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/events/events-to-elements.md b/content/events/events-to-elements.md
@@ -1,6 +1,4 @@
 ---
-chapter : events
-section : 2
 title   : Connecting Events to Elements
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/events/inside-event-handling-function.md b/content/events/inside-event-handling-function.md
@@ -1,6 +1,4 @@
 ---
-chapter : events
-section : 3
 title   : Inside the Event Handling Function
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/events/introduction-to-custom-events.md b/content/events/introduction-to-custom-events.md
@@ -1,6 +1,4 @@
 ---
-chapter :     Custom Events
-section:      0
 title:        Introducing Custom Events
 attribution:  $jQuery Fundamentals
 ---

diff --git a/content/events/triggering-event-handlers.md b/content/events/triggering-event-handlers.md
@@ -1,6 +1,4 @@
 ---
-chapter : events
-section : 4
 title   : Triggering Event Handlers
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/how-to/add_keyboard_navigation.md → content/faq/add_keyboard_navigation.md b/content/how-to/add_keyboard_navigation.md → content/faq/add_keyboard_navigation.md
diff --git a/content/faq/dex.md b/content/faq/dex.md
@@ -0,0 +1,3 @@
+---
+title: Frequently Asked Questions
+---
diff --git a/content/how-to/enable_the_back_button.md → content/faq/enable_the_back_button.md b/content/how-to/enable_the_back_button.md → content/faq/enable_the_back_button.md
diff --git a/content/how-to/dex.md b/content/how-to/dex.md
diff --git a/content/javascript-101/arrays.md b/content/javascript-101/arrays.md
@@ -1,6 +1,4 @@
 ---
-chapter :     js101
-section:      6
 title:        Arrays
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/javascript-101/closures.md b/content/javascript-101/closures.md
@@ -1,6 +1,4 @@
 ---
-chapter :     js101
-section:      12
 title:        Closures
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/javascript-101/conditional-code.md b/content/javascript-101/conditional-code.md
@@ -1,6 +1,4 @@
 ---
-chapter :     js101
-section:      3
 title:        Conditional Code
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/javascript-101/dex.md b/content/javascript-101/dex.md
@@ -1,10 +1,8 @@
 ---
 title : JavaScript 101
-chapter : javascript-101
-section : 1
 attribution: jQuery Fundamentals
 ---
 
 jQuery is built on top of JavaScript, a rich and expressive language in its own right. This means when using jQuery, we are still writing valid JavaScript; it just serves as a framework to make many aspects of writing JavaScript easier and more reliable in the various browser environments. With that said, a basic knowledge of JavaScript will go a long way in understanding, structuring, and debugging our code; jQuery will just help make that basic knowledge go much, much further.
 
-This section covers the basic concepts of JavaScript, as well as some frequent pitfalls many developers fall into during their first foray into the language. While it will be of particular value to people with little to no programming experience, even people who have used other programming languages may benefit from learning about some of the peculiarities of JavaScript.
+This section covers the basic concepts of JavaScript, as well as some frequent pitfalls many developers fall into during their first foray into the language. While it will be of particular value to people with little to no programming experience, even people who have used other programming languages may benefit from learning about some of the peculiarities of JavaScript.
diff --git a/content/javascript-101/functions.md b/content/javascript-101/functions.md
@@ -1,6 +1,4 @@
 ---
-chapter :     js101
-section:      8
 title:        Functions
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/javascript-101/loops.md b/content/javascript-101/loops.md
@@ -1,6 +1,4 @@
 ---
-chapter :     js10
-section:      4
 title:        Loops
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/javascript-101/objects.md b/content/javascript-101/objects.md
@@ -1,6 +1,4 @@
 ---
-chapter :     js101
-section:      7
 title:        Objects
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/javascript-101/operators.md b/content/javascript-101/operators.md
@@ -1,6 +1,4 @@
 ---
-chapter :     js101
-section:      2
 title:        Operators
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/javascript-101/reserved-words.md b/content/javascript-101/reserved-words.md
@@ -1,6 +1,4 @@
 ---
-chapter :     js101
-section:      5
 title:        Reserved Words
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/javascript-101/running-code.md b/content/javascript-101/running-code.md
@@ -1,6 +1,4 @@
 ---
-chapter:      javascript-101
-section:      1
 title:        Running Code
 attribution:  jQuery Fundamentals
 github: jquery

diff --git a/content/javascript-101/scope.md b/content/javascript-101/scope.md
@@ -1,6 +1,4 @@
 ---
-chapter :     js101
-section:      11
 title:        Scope
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/javascript-101/syntax-basics.md b/content/javascript-101/syntax-basics.md
@@ -1,6 +1,4 @@
 ---
-chapter:      javascript-101
-section:      2
 title:        Syntax Basics
 attribution:  jQuery Fundamentals
 github: jquery

diff --git a/content/javascript-101/testing-type.md b/content/javascript-101/testing-type.md
@@ -1,6 +1,4 @@
 ---
-chapter :     js101
-section:      9
 title:        Testing Type
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/javascript-101/this-keyword.md b/content/javascript-101/this-keyword.md
@@ -1,6 +1,4 @@
 ---
-chapter :     js101
-section:      10
 title:        The "this" Keyword
 attribution:  jQuery Fundamentals
 ---

diff --git a/content/javascript-101/types.md b/content/javascript-101/types.md
@@ -1,6 +1,4 @@
 ---
-chapter:      javascript-101
-section:      2
 title:        Types
 attribution:  jQuery Fundamentals
 github: jquery

diff --git a/content/performance/append-outside-loop.md b/content/performance/append-outside-loop.md
@@ -1,6 +1,4 @@
 ---
-chapter :     performance
-section:      0
 title:        Append Outside of Loops
 attribution:  jQuery Fundamentals
 tags:         performance

diff --git a/content/performance/cache-loop-length.md b/content/performance/cache-loop-length.md
@@ -1,6 +1,4 @@
 ---
-chapter :     performance
-section:      0
 title:        Cache Length During Loops
 attribution:  jQuery Fundamentals
 tags:         performance

diff --git a/content/performance/clever-conditionals.md b/content/performance/clever-conditionals.md
@@ -1,6 +1,4 @@
 ---
-chapter :     performance
-section:      0
 title:        Clever Conditionals
 attribution:  jQuery Fundamentals
 tags:         performance

diff --git a/content/performance/detach-elements-before-work-with-them.md b/content/performance/detach-elements-before-work-with-them.md
@@ -1,6 +1,4 @@
 ---
-chapter :     performance
-section:      0
 title:        Detach Elements to Work with Them
 attribution:  jQuery Fundamentals
 tags:         performance