Use bower for deps. Add initial markdown support

briancavalier · May 22, 2013 · 862ec9b · 862ec9b
1 parent a642949
commit 862ec9b
Show file tree

Hide file tree

Showing 30 changed files with 45 additions and 1,758 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+/node_modules
+/.idea
+/components
+.DS_Store
diff --git a/.gitmodules b/.gitmodules
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -2,7 +2,7 @@ Open Source Initiative OSI - The MIT License
 
 http://www.opensource.org/licenses/mit-license.php
 
-Copyright (c) 2011 Brian Cavalier
+Copyright (c) 2011-2013 Brian Cavalier
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/README.mdown → README.md b/README.mdown → README.md
diff --git a/app/hc/markdown.js b/app/hc/markdown.js
@@ -0,0 +1,15 @@
+/*
+ @license Copyright (c) 2011 Brian Cavalier
+ LICENSE: see the LICENSE.txt file. If file is missing, this file is subject
+ to the MIT License at: http://www.opensource.org/licenses/mit-license.php.
+ */
+define(['marked'], function(marked) {
+	return {
+		load: function (absId, require, loaded, config) {
+			require(['text!' + absId], function(text) {
+				marked.setOptions(config);
+				loaded(marked(text));
+			});
+		}
+	}
+});
diff --git a/app/hc/slides/PresentationController.js b/app/hc/slides/PresentationController.js
@@ -1,12 +1,12 @@
 /*
- 	@license Copyright (c) 2011 Brian Cavalier
+ 	@license Copyright (c) 2011-2013 Brian Cavalier
 	LICENSE: see the LICENSE.txt file. If file is missing, this file is subject
 	to the MIT License at: http://www.opensource.org/licenses/mit-license.php.
  */
 /*
 	Class: PresentationController
 */
-define([], function() {
+define(function() {
 
 	var doc = window.document,
 		html = doc.getElementsByTagName('html')[0],

diff --git a/app/hc/slides/SingleFilePresentationModel.js b/app/hc/slides/SingleFilePresentationModel.js
@@ -29,7 +29,7 @@ define(['require', 'when'], function(require, when) {
 			loaded = false,
 			resolveOnLoad = [];
 
-		require(['text!' + slidePath], function(slideContent) {
+		require([slidePath], function(slideContent) {
 			cachedSlides = slideContent.split(/\s*\<hr\s*\/?\>\s*|\s*----\s*/i);
 			loaded = true;
 

diff --git a/app/main.js b/app/main.js
@@ -9,7 +9,7 @@ define([
 	function(Model, View, Controller) {
 		var model, view, controller;
 
-		model = new Model('slides/slides.html');
+		model = new Model('text!slides/slides.html');
 		view = new View(document.getElementById('slide-container'), model);
 		controller = new Controller(view);
 

diff --git a/app/run.js b/app/run.js
@@ -3,16 +3,17 @@
 	// Configure curl and load components, theme css,
 	// and wait for DOM Ready.  Then create model, view,
 	// and controller, and start the presentation.
-	var config = {
-		baseUrl: '',
+	curl({
+		main: 'app/main',
 		paths: {
-			'themes': 'css/themes'
+			'themes': 'css/themes',
+			'markdown': 'app/hc/markdown'
 		},
-		packages: [
-			{ name: 'when', location: 'lib/when', main: 'when' }
-		]
-	};
-
-	curl(config, ['app/main']);
+		packages: {
+			curl: { location: 'components/curl/src/curl' },
+			when: { location: 'components/when', main: 'when' },
+			marked: { location: 'components/marked', main: 'lib/marked' }
+		}
+	});
 
 })(window.curl);
diff --git a/bower.json b/bower.json
@@ -0,0 +1,9 @@
+{
+  "name": "slides",
+  "version": "2.0.0",
+  "dependencies": {
+    "when": "~2",
+    "marked": "~0.2",
+    "curl": "~0.7"
+  }
+}
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>  
 
 <!--
-	Copyright (c) 2011 Brian Cavalier
+	Copyright (c) 2011-2013 Brian Cavalier
 	LICENSE: see the LICENSE.txt file. If file is missing, this file is subject
 	to the MIT License at: http://www.opensource.org/licenses/mit-license.php.
 
@@ -42,7 +42,7 @@
 	</style>
 
 	<!-- Load curl AMD Loader -->
-	<script src="lib/curl.js"></script>
+	<script src="components/curl/src/curl.js"></script>
 
 	<!-- Start the app by configuring curl and loading modules -->
 	<script src="app/run.js"></script>

diff --git a/lib/curl.js b/lib/curl.js
diff --git a/lib/when/.editorconfig b/lib/when/.editorconfig
diff --git a/lib/when/.gitignore b/lib/when/.gitignore
diff --git a/lib/when/.gitmodules b/lib/when/.gitmodules
diff --git a/lib/when/.jshintrc b/lib/when/.jshintrc
diff --git a/lib/when/.travis.yml b/lib/when/.travis.yml
diff --git a/lib/when/LICENSE.txt b/lib/when/LICENSE.txt