Working on updated version

emmetio · Mar 5, 2015 · 98725a9 · 98725a9
1 parent 882d1b5
commit 98725a9
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 54 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/docpad.coffee b/docpad.coffee
@@ -1,5 +1,7 @@
 exec = require('child_process').exec
+gulp = require 'gulp'
 hljs = require './plugins/highlight.js'
+jsBundler = require 'js-bundler'
 
 docpadConfig = {
 	templateData:
@@ -25,16 +27,16 @@ docpadConfig = {
 
 	events:
 		# Regenerate assets each time resources are changed
-		generateBefore: (opts, next) ->
-			# do not re-buid assets in debug mode, save resources
-			if @docpad.getConfig().frontendDebug
-				return next()
+		# generateBefore: (opts, next) ->
+		# 	# do not re-buid assets in debug mode, save resources
+		# 	if @docpad.getConfig().frontendDebug
+		# 		return next()
 
-			proc = exec 'grunt', {cwd: process.cwd()}, (error, stdout, stderr) ->
-				console.log stdout
-				process.exit() if error
+		# 	proc = exec 'grunt', {cwd: process.cwd()}, (error, stdout, stderr) ->
+		# 		console.log stdout
+		# 		process.exit() if error
 
-			proc.on 'exit', next
+		# 	proc.on 'exit', next
 
 		# Extend server so it can respond to cache-reset assets
 		serverAfter: ({server}) ->
@@ -61,6 +63,16 @@ docpadConfig = {
 						.toLowerCase()
 
 					"<#{name}><a name=\"#{anchor}\" href=\"\##{anchor}\" class=\"anchor\"></a>#{header}</#{name}>"
+
+		writeAfter: (opts, next) ->
+			console.log 'Write after'
+			gulp.src('./src/files/js/*.js', base: './src/files')
+				.pipe(jsBundler standalone: true, global: true)
+				.pipe(gulp.dest './out')
+				.on('error', () -> @end())
+				.on 'end', () -> 
+					console.log 'Gulp done'
+					next()
 }
 
 module.exports = docpadConfig
diff --git a/package.json b/package.json
@@ -1,20 +1,21 @@
 {
   "name": "emmetio-docs",
   "description": "Emmet Docs & Tutorials",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
-  "dependencies": {
-    "underscore": "1.3.x",
-    "csso": "*",
-    "docpad-plugin-marked": ">=2",
-    "docpad-plugin-eco": ">=2",
-    "docpad-plugin-partials": "2.x",
-    "docpad-plugin-menu": "2.x",
-    "docpad-plugin-frontend": "2.x",
-    "grunt-frontend": "~1.1.2"
-  },
   "devDependencies": {
-    "grunt": "~0.4",
-    "grunt-contrib-copy": "~0.4"
+    "docpad": "^6.73.5",
+    "docpad-plugin-eco": "^2.1.0",
+    "docpad-plugin-frontend": "^2.0.1",
+    "docpad-plugin-marked": "^2.3.0",
+    "docpad-plugin-menu": "^2.1.0",
+    "docpad-plugin-partials": "^2.9.2",
+    "gulp": "^3.8.11",
+    "js-bundler": "git+https://github.com/sergeche/js-bundler.git#v1.0.0"
+  },
+  "dependencies": {
+    "codemirror": "^5.0.0",
+    "codemirror-movie": "git+https://github.com/sergeche/codemirror-movie.git#es6",
+    "emmet-codemirror": "^1.2.0"
   }
 }
diff --git a/src/files/codemirror-movie b/src/files/codemirror-movie
diff --git a/src/files/js/jquery-1.8.2.min.js b/src/files/js/jquery-1.8.2.min.js
diff --git a/src/files/js/movie.js b/src/files/js/movie.js
@@ -0,0 +1,19 @@
+import cmEmmet from 'emmet-codemirror';
+import movie from 'codemirror-movie';
+import CodeMirror from 'codemirror';
+
+var emmet = cmMovie.emmet;
+var ios = /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent);
+var mac = ios || /Mac/.test(navigator.platform);
+
+// Windows has poor Unicode symbols support
+var buttonLabels = {
+	'play': (mac ? '▶ ' : '') + 'Play demo',
+	'pause': (mac ? '\u275a\u275a ' : '') + 'Pause',
+	'play_again': (mac ? '▶ ' : '') + 'Play again',
+	'try_yourself': 'Try it yourself'
+};
+
+function setupMovie(elem) {
+
+}
diff --git a/src/files/js/zepto.min.js b/src/files/js/zepto.min.js
diff --git a/src/files/js/cheatsheet-controller.js → src/files/old-js/cheatsheet-controller.js b/src/files/js/cheatsheet-controller.js → src/files/old-js/cheatsheet-controller.js
diff --git a/src/files/js/cheatsheet-css.js → src/files/old-js/cheatsheet-css.js b/src/files/js/cheatsheet-css.js → src/files/old-js/cheatsheet-css.js
diff --git a/src/files/js/cheatsheet.js → src/files/old-js/cheatsheet.js b/src/files/js/cheatsheet.js → src/files/old-js/cheatsheet.js
diff --git a/src/files/js/misc.js → src/files/old-js/misc.js b/src/files/js/misc.js → src/files/old-js/misc.js
diff --git a/src/files/js/movie-definition.js → src/files/old-js/movie-definition.js b/src/files/js/movie-definition.js → src/files/old-js/movie-definition.js
diff --git a/src/layouts/default.html.eco b/src/layouts/default.html.eco
@@ -1,6 +1,6 @@
 ---
-css: "/c/main.css"
-js:  "/j/movie.js, /j/main.js"
+css: "/css/main.css"
+js:  "/js/movie.js, /js/main.js"
 ---
 <!doctype html>
 <!--[if lt IE 7]>      <html class="no-js lt-ie10 lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
@@ -13,17 +13,8 @@ js:  "/j/movie.js, /j/main.js"
 <meta http-equiv="X-UA-Compatible" content="chrome=1" />
 <title><%= @document.title %></title>
 <link rel="shortcut icon" href="/favicon.ico" />
-<% for url in @assets('css'): %>
-<link rel="stylesheet" href="<%= url %>" />
-<% end %>
-<script>document.write('<script src="/j/' + ('__proto__' in {} ? 'zepto.min' : 'jquery-1.8.2.min') + '.js"><\/script>')</script>
-<% for url in @assets('js'): %>
-<script src="<%= url %>"></script>
-<% end %>
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
-<!--[if lt IE 9]>
-<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
+<% for url in @assets('css'): %><link rel="stylesheet" href="<%= url %>" /><% end %>
 </head>
 <body>
 	<div class="wrapper">
@@ -50,6 +41,8 @@ js:  "/j/movie.js, /j/main.js"
 			<p class="small-text"><a href="https://github.com/emmetio/emmet-docs/tree/master/src/documents<%= @document.url %>.md">View page source on GitHub</a></p>
 		</footer>
 	</div>
+
+<% for url in @assets('js'): %><script src="<%= url %>"></script><% end %>
 <script>
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-4523560-5']);

diff --git a/src/toc.txt b/src/toc.txt