shining 1.1.3 → 1.1.4

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/jquery.shining.js

@@ -14,9 +14,13 @@
       first:    function() { return this._slides[0] },
       last:     function() { return this._slides[ this._slides.length - 1 ] },
       next:     function() { return this._slides[ this._slides.indexOf(this.current()) + 1 ] },
-      previous: function() { return this._slides[ this._slides.indexOf(this.current()) - 1 ] },
+      previous: function() { 
+        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) },
       _slides: [],
+      _loaded: {},
       _current: 0
     };
 
@@ -122,8 +126,9 @@
       });
       $(window).resize(function() { $('#stage').centralize() });
       loadConfig(function() {
-        var startAt = document.location.hash.replace('#', '');
-        loadSlide(startAt ? startAt : $.shining.slides.current(), true);
+        var startAt = document.location.hash.replace('#', ''),
+          firstSlide = startAt ? startAt : $.shining.slides.current();
+        loadSlide(firstSlide, function() { playSlide(firstSlide) });
         setTitle($.shining.config.title);
         setTheme($.shining.config.theme);
         parseEffects();
@@ -142,9 +147,9 @@
     function getSlide(name) {
       if (!name) return false;
       applyTransition(
-        function() { loadSlide(name) },
+        function() { loadSlide(name, function() { playSlide(name) }) },
         function() {
-          $.shining.scripts.run($.shining.currentScript) 
+          $.shining.scripts.run($.shining.slides._loaded[$.shining.slides.current()].script) 
         }
       )
     }
@@ -160,37 +165,41 @@
       return $('link.theme').attr('href', path);
     }
 
-    // private
     function slide(name) {
       return 'slides/' + name;
     }
-
-    function vendored() {
-      return $('script:first').attr('src').match(/^vendor/);
-    }
-
-    function loadSlide(name, runScript) {
-      $('#stage .contents').load(
+    
+    function loadSlide(name, afterLoad) {
+      $.get(
         slide(name).markup(),
         function(data) {
-          $.shining.slides.current(name);
-          $('link.slide').remove(); // remove now previous slide styles
-          if (SyntaxHighlighter) SyntaxHighlighter.highlight();
-          $('#stage').centralize();
-          $.shining.scripts.reap();
-          updateControlAnchors();
+          $.shining.slides._loaded[name] = {};
+          $.shining.slides._loaded[name].markup = data;
           if (data) {
-            loadSlideScript(name, runScript);
+            loadSlideScript(name, afterLoad);
             loadSlideStyle(name);
           }
         }
       );
     }
+    
+    function playSlide(name) {
+      var slide = $.shining.slides._loaded[name];
+      $('#stage .contents').html(slide.markup);
+      $.shining.scripts.run(slide.script);
+      updateControlAnchors();
+    }
 
-    function loadSlideScript(name, run) {
-      $.get(slide(name).script(), function(script) {
-        $.shining.currentScript = script;
-        if (run) $.shining.scripts.run($.shining.currentScript);
+    function loadSlideScript(name, afterLoad) {
+      $.ajax({
+        url: slide(name).script(),
+        type: 'GET',
+        success: function(script) {
+          $.shining.slides._loaded[name].script = script;
+        },
+        complete: function() {
+          if ($.isFunction(afterLoad)) afterLoad.call();  
+        }
       })
     }
 
@@ -205,6 +214,10 @@
         callback.call();
       });
     }
+    
+    function local() {
+      document.location.protocol == 'file:'
+    }
 
     function parseEffects() {
       $.get($('link[href$=effects.css]').attr('href'),
@@ -246,6 +259,7 @@
         return parsed;
       },
       run:          function(script) {
+        if (typeof script == 'undefined' || script == '') return false;
         var parsed = $.shining.scripts.parse(script), all = [];
         for (var i = 0; parsed.length > i; i += 2) {
           all.push(["at(", parsed[i], ", function() { ", parsed[i+1], " })"].join(''));

data/shining.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shining}
-  s.version = "1.1.3"
+  s.version = "1.1.4"
 
   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-12}
+  s.date = %q{2010-04-16}
   s.description = %q{Webkit + CSS + Javascript = awesome presos}
   s.email = %q{julio.ody@gmail.com}
   s.executables = ["console", "shine"]

data/templates/config.json

@@ -1,4 +1,5 @@
 {
   "slides":       ["welcome"],
+  "title":        "Your presentation",
   "transitions":  "fade"
 }

data/templates/index.html

@@ -16,7 +16,6 @@
   <body>
     <section id="stage">
       <div class="contents"></div>
-      
     </section>
     <nav id="controls" class="transparent">
       <a id="first"><<</a>

data/templates/slides/welcome.html

@@ -1,4 +1,4 @@
 <h1 class="centered">Welcome to your preso!</h1>
 <p class="centered">
-  Lorem Ipsum is hard to understand.
+  Bettlejuice! Bettlejuice! Bettlejuice!
 </p>

data/themes/default.css

@@ -2,6 +2,10 @@ body          { background-color: rgb(48, 48, 48) }
 #stage        { 
   -webkit-box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.6);
   -webkit-border-radius: 5px;
+  -moz-box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.6);
+  -moz-border-radius: 5px;
+  box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.6);
+  border-radius: 5px;  
 }
 
 h1, h2, h3, p, li { color: rgb(238, 238, 238); text-shadow: rgb(0, 0, 0) 2px 2px 4px }
@@ -16,6 +20,9 @@ ul                { list-style-type: disc }
   background-color: rgba(0, 0, 0, 0.5);
   -webkit-border-top-left-radius: 5px;
   -webkit-border-top-right-radius: 5px;  
+  -moz-border-radius-topleft: 5px;
+  -moz-border-radius-topright: 5px;  
+  
 }
 #controls a   { display: inline-block; width: 75px; padding: 5px 0; font-weight: bold; color: #fff; }
 em            { color: rgb(73, 255, 80) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shining
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 +10:00
+date: 2010-04-16 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency