Merge pull request #292 from tripit/dev

Slate 1.2.1 @lord my fault, I seemed to have totally missed the emails sent!
slatedocs · Jul 27, 2015 · adeb496 · adeb496
2 parents b9d45b2 + ad3b276
commit adeb496
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Version 1.2
 
-*June 20, 2014*
+*June 20, 2015*
 
 **Fixes:**
 

diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gem 'middleman-gh-pages', '~> 0.0.3'
 gem 'middleman-syntax', '~> 2.0.0'
 gem 'middleman-autoprefixer', '~> 2.4.4'
 gem 'rouge', '~> 1.9.0'
-gem 'redcarpet', '~> 3.3.1'
+gem 'redcarpet', '~> 3.3.2'
 
 gem 'rake', '~> 10.4.2'
 gem 'therubyracer', '~> 0.12.1', platforms: :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
     rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.3.1)
+    redcarpet (3.3.2)
     ref (1.0.5)
     rouge (1.9.0)
     sass (3.4.14)
@@ -135,6 +135,6 @@ DEPENDENCIES
   middleman-gh-pages (~> 0.0.3)
   middleman-syntax (~> 2.0.0)
   rake (~> 10.4.2)
-  redcarpet (~> 3.3.1)
+  redcarpet (~> 3.3.2)
   rouge (~> 1.9.0)
   therubyracer (~> 0.12.1)
diff --git a/source/javascripts/app/_toc.js b/source/javascripts/app/_toc.js
@@ -1,5 +1,6 @@
 //= require ../lib/_jquery_ui
 //= require ../lib/_jquery.tocify
+//= require ../lib/_imagesloaded.min
 (function (global) {
   'use strict';
 
@@ -37,14 +38,18 @@
 
   // Hack to make already open sections to start opened,
   // instead of displaying an ugly animation
-  function animate () {
+  function animate() {
     setTimeout(function() {
       toc.setOption('showEffectSpeed', 180);
     }, 50);
   }
 
-  $(makeToc);
-  $(animate);
-
+  $(function() {
+    makeToc();
+    animate();
+    $('.content').imagesLoaded( function() {
+      global.toc.calculateHeights();
+    });
+  });
 })(window);
 
diff --git a/source/javascripts/lib/_imagesloaded.min.js b/source/javascripts/lib/_imagesloaded.min.js