shining 1.1.4 → 1.1.5

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/css/base.css

@@ -4,17 +4,17 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
 margin : 0; padding : 0; border : 0; outline : 0; font-size : 100%; vertical-align : baseline; background : transparent; }
 body { line-height : 1; }
 ol, ul { list-style-type : none; }
-:focus { outline : 0 } 
+:focus { outline : 0 }
 ins { text-decoration : none; }
 del { text-decoration : line-through }
 
-body  { 
+body  {
   font: 12px/1.5 "Lucida Grande", Tahoma, serif;
   overflow: hidden;
   text-align: center;
 }
 
-#stage  { 
+#stage  {
   position: relative;
   display: inline-block;
   padding: 40px 20px;
@@ -41,6 +41,19 @@ a          { cursor: pointer }
 
 div.slice { position: absolute; display: block; width: 0; top: -10px; bottom: -10px }
 
+#help {
+  display: inline-block;
+  font-size: 200%;
+  opacity: 0;
+  position: fixed;
+  right: 10px;
+  top: 10px;
+  background-color: #000;
+  background-color: rgba(0, 0, 0, 0.2);
+  color: #fff;
+  padding: 10px;
+}
+
 @media all and (min-width: 480px)   { #stage  { font-size: 80% } }
 @media all and (min-width: 640px)   { #stage  { font-size: 100% } }
 @media all and (min-width: 800px)   { #stage  { font-size: 130% } }

data/lib/config.ru

@@ -0,0 +1,4 @@
+use Rack::Static, :root => File.dirname(__FILE__), :urls => %w(/vendor/css /vendor/lib /slides /config.json /vendor/themes)
+run lambda { |env| 
+  [200, { 'Content-Type' => 'text/html', 'Cache-Control' => 'public, max-age=86400' }, [File.read('index.html')]] 
+}

data/lib/jquery.shining.js

@@ -18,7 +18,8 @@
         var previous = this._slides[ this._slides.indexOf(this.current()) - 1 ];
         return previous ? previous : this.first();
       },
-      add:      function(slides) { return Array.prototype.push.apply(this._slides, slides) },
+      add:      function(slides)  { return Array.prototype.push.apply(this._slides, slides) },
+      loaded:   function(name)    { return !!$.shining.slides._loaded[name] },
       _slides: [],
       _loaded: {},
       _current: 0
@@ -94,6 +95,8 @@
     String.prototype.markup = function() { return this + '.html' };
     String.prototype.script = function() { return this + '.js' };
     String.prototype.style  = function() { return this + '.css' };
+    
+    var KEY = { SPACE: 32, RIGHT: 39, LEFT: 37 };
 
     $.fn.effect = function(name) { return this.each(function() { applyEffect(this, name) }); }
     $.fn.hasClasses = function(classes) {
@@ -105,8 +108,14 @@
     $.extend($.shining, {
       firstSlide:     function() { getSlide($.shining.slides.first()) },
       lastSlide:      function() { getSlide($.shining.slides.last() ) },
-      nextSlide:      function() { getSlide($.shining.slides.next()) },
-      previousSlide:  function() { getSlide($.shining.slides.previous()) },
+      nextSlide:      function() { 
+        getSlide($.shining.slides.next());
+        trigger('next');
+      },
+      previousSlide:  function() { 
+        getSlide($.shining.slides.previous());
+        trigger('previous');
+      },
       getSlide:       function(slide) { getSlide(slide) }
     });
 
@@ -125,17 +134,31 @@
         $('#stage').centralize();
       });
       $(window).resize(function() { $('#stage').centralize() });
+      bindKeys();
       loadConfig(function() {
         var startAt = document.location.hash.replace('#', ''),
           firstSlide = startAt ? startAt : $.shining.slides.current();
         loadSlide(firstSlide, function() { playSlide(firstSlide) });
+        if (!local() && !$.shining.config.preventPreload) preloadSlides();
         setTitle($.shining.config.title);
-        setTheme($.shining.config.theme);
+        setTheme($.shining.config.theme); 
         parseEffects();
         updateControlAnchors();
+        trigger('init.shining');
+        help('← (previous slide), → or SPACE BAR (next slide)', 3000);
       });
     }
-
+    
+    function trigger(event, data) {
+      $(document).trigger(event + '.shining', data);
+    }
+    
+    function bind(event, method) {
+      $(document).bind(event + '.shining', method);
+    }
+        
+    $.shining.help = help;
+    
     function applyEffect(element, name) {
       if (name in FILTERS) {
         if ($(element).hasClasses(FILTERS[name].when)) $(element).removeClass(FILTERS[name].remove)
@@ -170,17 +193,28 @@
     }
     
     function loadSlide(name, afterLoad) {
-      $.get(
-        slide(name).markup(),
-        function(data) {
-          $.shining.slides._loaded[name] = {};
-          $.shining.slides._loaded[name].markup = data;
-          if (data) {
-            loadSlideScript(name, afterLoad);
-            loadSlideStyle(name);
+      if (!$.shining.slides.loaded(name)) {
+        $.get(
+          slide(name).markup(),
+          function(data) {
+            $.shining.slides._loaded[name] = {};
+            $.shining.slides._loaded[name].markup = data;
+            if (data) {
+              loadSlideScript(name, afterLoad);
+              loadSlideStyle(name);
+            }
           }
-        }
-      );
+        );        
+      } else {
+        afterLoad.call()
+        loadSlideStyle(name);        
+      }
+    }
+    
+    function preloadSlides() {
+      $($.shining.config.slides).each(function() {
+        loadSlide(this);
+      })
     }
     
     function playSlide(name) {
@@ -204,6 +238,7 @@
     }
 
     function loadSlideStyle(name) {
+      $('link.slide').remove();
       $('head').append('<link rel="stylesheet" type="text/css" href="' + slide(name).style() + '" media="all" class="slide"/>')
     }
 
@@ -215,6 +250,33 @@
       });
     }
     
+    function bindKeys() {
+      $(window).keydown(function(event) {
+        switch(event.keyCode) {
+          case KEY.RIGHT:
+          case KEY.SPACE:
+            $.shining.nextSlide();
+            break;
+          case KEY.LEFT:
+            $.shining.previousSlide();
+            break;
+        }
+      })
+    }
+    
+    function help(message, duration) {
+      if ($.shining.config.help == false) return false;
+      var duration = duration || 500;
+      $('#help').remove();
+      $('<div id="help"></div>')
+        .html(message)
+        .css({display: 'inline-block'})
+        .appendTo('body')
+        .animate({opacity: 1})
+        .delay(duration)
+        .fadeOut(200, function() { $('#help').remove() })
+    }
+    
     function local() {
       document.location.protocol == 'file:'
     }
@@ -271,12 +333,14 @@
         return $.shining.scripts.processes = [];
       }
     }
+    
+    bind('previous', function() { help('←') });
+    bind('next', function() { help('→') });
 
     init();
   }
   // boots!
   $.shining();
-
 })(jQuery);
 
 // Dependencies!!

data/shining.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shining}
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julio Cesar Ody"]
-  s.date = %q{2010-04-16}
+  s.date = %q{2010-04-20}
   s.description = %q{Webkit + CSS + Javascript = awesome presos}
   s.email = %q{julio.ody@gmail.com}
   s.executables = ["console", "shine"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "images/page_white_code.png",
      "images/page_white_copy.png",
      "images/printer.png",
+     "lib/config.ru",
      "lib/ext/filemethods.rb",
      "lib/ext/string.rb",
      "lib/jquery-1.4.1.min.js",

data/templates/index.html

@@ -7,7 +7,7 @@
     <link rel="stylesheet" type="text/css" href="<%= vendorized? ? 'vendor' : Shining.root %>/css/effects.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="<%= vendorized? ? 'vendor' : Shining.root %>/css/shCore.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="<%= vendorized? ? 'vendor' : Shining.root %>/css/shThemeFadeToGrey.css" media="all"/>
-    <link rel="stylesheet" type="text/css" href="<%= vendorized? ? 'vendor' : Shining.root %>/themes/default.css" media="all"/>
+    <link rel="stylesheet" type="text/css" href="<%= vendorized? ? 'vendor' : Shining.root %>/themes/default.css" media="all" class="theme"/>
     <script type="text/javascript" charset="utf-8" src="<%= vendorized? ? 'vendor' : Shining.root %>/lib/jquery-1.4.1.min.js"></script>
     <script type="text/javascript" charset="utf-8" src="<%= vendorized? ? 'vendor' : Shining.root %>/lib/shCore.js"></script>
     <script type="text/javascript" charset="utf-8" src="<%= vendorized? ? 'vendor' : Shining.root %>/lib/shBrushAll.js"></script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shining
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +10:00
+date: 2010-04-20 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,6 +116,7 @@ files:
 - images/page_white_code.png
 - images/page_white_copy.png
 - images/printer.png
+- lib/config.ru
 - lib/ext/filemethods.rb
 - lib/ext/string.rb
 - lib/jquery-1.4.1.min.js