Adding compass/sass. Fixing slide # logic. Fixing slide # at bottom off slide. Fixigin prettify logic when it is false

7 files changed, 1650 insertions, 99 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..85db507
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,38 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+*.pyc
+*.min.css
+#*.min.js
+.sass-cache/*
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
+*~
\ No newline at end of file
diff --git a/config.rb b/config.rb
new file mode 100644
index 0000000..ed97773
--- /dev/null
+++ b/config.rb
@@ -0,0 +1,24 @@
+# Require any additional compass plugins here.
+
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "theme/css"
+sass_dir = "theme/sass"
+images_dir = "images"
+javascripts_dir = "js"
+
+# You can select your preferred output style here (can be overridden via the command line):
+#output_style = :compressed #:expanded or :nested or :compact or :compressed
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
+
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+# preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
diff --git a/slides.js b/js/slides.js
index db2c636..3cb2852 100644
--- a/slides.js
+++ b/js/slides.js
@@ -16,8 +16,14 @@ function SlideDeck() {
  * @const
  * @private
  */
-SlideDeck.prototype.SLIDE_CLASSES_ = ['far-past', 'past', 'current', 'next',
-    'far-next'];
+SlideDeck.prototype.SLIDE_CLASSES_ = [
+  'far-past', 'past', 'current', 'next', 'far-next'];
+
+/**
+ * @const
+ * @private
+ */
+SlideDeck.prototype.CSS_DIR_ = 'theme/css/';
 
 /**
  * @private
@@ -26,7 +32,9 @@ SlideDeck.prototype.getCurrentSlideFromHash_ = function() {
   var slideNo = parseInt(document.location.hash.substr(1));
 
   if (slideNo) {
-    this.curSlide_ = slideNo;
+    this.curSlide_ = slideNo - 1;
+  } else {
+    this.curSlide_ = 0;
   }
 };
 
@@ -36,6 +44,11 @@ SlideDeck.prototype.getCurrentSlideFromHash_ = function() {
 SlideDeck.prototype.handleDomLoaded_ = function() {
   this.slides_ = document.querySelectorAll('slide:not(.hidden)');
 
+  for (var i = 0, slide; slide = this.slides_[i]; ++i) {
+    slide.dataset.slideNum = i + 1;
+    slide.dataset.totalSlides = this.slides_.length;
+  }
+
   // Load config
   this.loadConfig_();
   this.addEventListeners_();
@@ -150,8 +163,9 @@ SlideDeck.prototype.loadConfig_ = function() {
     document.title = settings.title;
   }
 
-  if (settings.usePrettify || true) {
+  if (!!!('usePrettify' in settings) || settings.usePrettify) {
     console.log('Use prettify');
+    //TODO
   }
 
   if (settings.analyticsId) {
@@ -216,7 +230,7 @@ SlideDeck.prototype.buildNextItem_ = function() {
  * @param {boolean=} opt_dontPush
  */
 SlideDeck.prototype.prevSlide = function(opt_dontPush) {
-  if (this.curSlide_ > 1) {
+  if (this.curSlide_ > 0) {
     this.curSlide_--;
 
     this.updateSlides_(opt_dontPush);
@@ -339,10 +353,22 @@ SlideDeck.prototype.disableFrame_ = function(frame) {
 /**
  * @private
  * @param {number} slideNo
+ */
+SlideDeck.prototype.getSlideEl_ = function(no) {
+  if ((no < 0) || (no >= this.slides_.length)) {
+    return null;
+  } else {
+    return this.slides_[no];
+  }
+};
+
+/**
+ * @private
+ * @param {number} slideNo
  * @param {string} className
  */
 SlideDeck.prototype.updateSlideClass_ = function(slideNo, className) {
-  var el = this.slides_[slideNo - 1];
+  var el = this.getSlideEl_(slideNo);
 
   if (!el) {
     return;
@@ -382,9 +408,10 @@ SlideDeck.prototype.makeBuildLists_ = function () {
  */
 SlideDeck.prototype.updateHash_ = function(dontPush) {
   if (!dontPush) {
-    var hash = '#' + this.curSlide_;
+    var slideNo = this.curSlide_ + 1;
+    var hash = '#' + slideNo;
     if (window.history.pushState) {
-      window.history.pushState(this.curSlide_, 'Slide ' + this.curSlide_, hash);
+      window.history.pushState(this.curSlide_, 'Slide ' + slideNo, hash);
     } else {
       window.location.replace(hash);
     }
@@ -411,13 +438,13 @@ SlideDeck.prototype.addFavIcon_ = function(favIcon) {
  * @param {string} theme
  */
 SlideDeck.prototype.loadTheme_ = function(theme) {
-  var styles = ['base', theme];
+  var styles = [theme];
   for (var i = 0, style; themeUrl = styles[i]; i++) {
     var style = document.createElement('link');
     style.rel = 'stylesheet';
     style.type = 'text/css';
     if (themeUrl.indexOf('http') == -1) {
-      style.href = 'theme/' + themeUrl + '.css';
+      style.href = this.CSS_DIR_ + themeUrl + '.css';
     } else {
       style.href = themeUrl;
     }
diff --git a/template.html b/template.html
index 74220cc..3100726 100644
--- a/template.html
+++ b/template.html
@@ -1,69 +1,69 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>Title</title>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-  </head>
-  <body style="display: none">
-    <slides>
-      <slide>
-        A Slide
-      </slide>
+<head>
+  <title>Title</title>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="chrome=1">
+</head>
+<body style="display: none">
+  <slides>
+    <slide>
+      A Slide
+    </slide>
 
-      <slide>
-        A Slide
-      </slide>
+    <slide>
+      A Slide
+    </slide>
 
-      <slide>
-        A Slide
-      </slide>
+    <slide>
+      A Slide
+    </slide>
 
-      <slide>
-        A Slide
-      </slide>
-    </slides>
+    <slide>
+      A Slide
+    </slide>
+  </slides>
 
-    <script type="text/slide-config">
+  <script type="text/slide-config">