Merge remote branch 'mocoso/joel'

Conflicts: example/two/slidesA.md
paul · Feb 11, 2010 · 6eb1d6e · 6eb1d6e
2 parents 9c45520 + e44757b
commit 6eb1d6e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/example/two/slidesA.md b/example/two/slidesA.md
@@ -16,12 +16,23 @@
 	  get '/' do
 	    'Hello world!'
 	  end
-	end
-
+	end	
 
 !SLIDE execute
 
 # Executable JavaScript #
 
 	@@@ javaScript
 	result = 3 + 3;
+
+!SLIDE
+
+# Write your own slides #
+
+Using [markdown](http://daringfireball.net/projects/markdown/)
+
+    !SLIDE
+
+    # Title of the slide #
+
+    How easy is this?
diff --git a/lib/showoff.rb b/lib/showoff.rb
@@ -46,7 +46,7 @@ def js_files
     end
 
     def process_markdown(name, content)
-      slides = content.split('!SLIDE')
+      slides = content.split(/^!SLIDE/)
       slides.delete('')
       final = ''
       if slides.size > 1

diff --git a/views/index.erb b/views/index.erb
@@ -26,7 +26,7 @@
   <% end %>
 
   <% js_files.each do |js_file| %>
-    <script type="text/javascript" src="/file/<%= js_file %>"></script>
+    <script type="text/javascript" src="file/<%= js_file %>"></script>
   <% end %>
 
   <script type="text/javascript">