Update CamanJS and fix IE

meltingice · Apr 9, 2013 · 8b7e60e · 8b7e60e
1 parent 37587ae
commit 8b7e60e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 24 deletions.
diff --git a/_assets/javascripts/examples.js.coffee b/_assets/javascripts/examples.js.coffee
@@ -47,6 +47,8 @@ renderPreset = (preset) ->
     presetBusy = false
 
 $(document).ready ->
+  return unless $("#example").length > 0
+
   caman = Caman '#example'
   presetCaman = Caman '#preset-example'
 

diff --git a/_assets/javascripts/ext/caman.full.js b/_assets/javascripts/ext/caman.full.js
diff --git a/_layouts/main.html b/_layouts/main.html
@@ -10,16 +10,9 @@
   {% endcss_asset_tag %}
 
   <link href='http://fonts.googleapis.com/css?family=Source+Code+Pro|Raleway:400,200,700' rel='stylesheet' type='text/css'>
-
-  {% if site.dev or site.server %} 
-    <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.js"></script>
-    <script type="text/javascript">
-      Caman.DEBUG = true
-    </script>
-  {% else %}
-    <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
-  {% endif %}
 
+  <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+
   {% javascript_asset_tag site %}
     - /_assets/javascripts/copy-command.js
     - /_assets/javascripts/ext/html5slider.js
@@ -28,6 +21,12 @@
     - /_assets/javascripts/examples.js.coffee
     - /_assets/javascripts/guides.js.coffee
   {% endjavascript_asset_tag %}
+
+  {% if site.dev or site.server %} 
+    <script type="text/javascript">
+      Caman.DEBUG = true
+    </script>
+  {% endif %}
 </head>
 <body>
   {{ content }}