shining 1.3.6 → 1.3.7

data/CHANGELOG.txt

@@ -1,3 +1,8 @@
+= 1.3.7
+
+* fixed slide scripts not playing at the appropriate time when opened directly.
+* added a "mimic" slidedown theme.
+
 = 1.3.6
 
 * slide steps, so you can progressively show content.

data/VERSION

@@ -1 +1 @@
-1.3.6
+1.3.7

data/lib/plugins/syntaxhighlighter.js

@@ -2,5 +2,5 @@
 // See http://alexgorbatchev.com/wiki/SyntaxHighlighter
 
 Shining.when('slideplay', function() {
-  if (SyntaxHighlighter) SyntaxHighlighter.highlight();
+  if (SyntaxHighlighter) SyntaxHighlighter.highlight({gutter: false});
 })

data/lib/shining.js

@@ -57,8 +57,8 @@
     // public methods
     firstSlide:     function() { getSlide(Shining.slides.first()) },
     lastSlide:      function() { getSlide(Shining.slides.last() ) },
-    nextSlide:      function() { if (Shining.slides.next()) { trigger('next') } },
-    previousSlide:  function() { if (Shining.slides.previous()) { trigger('previous') } },
+    nextSlide:      function() { trigger('next') },
+    previousSlide:  function() { trigger('previous') },
     getSlide:       function(slide) { getSlide(slide) },
     help:     help,
     init:     init,
@@ -227,7 +227,7 @@
 
   function setTheme(name) {
     if (!name || name == "default") { return false };
-    var path = $('link.theme').attr('href').replace('default.css', name + 'css');
+    var path = $('link.theme').attr('href').replace('default.css', name + '.css');
     return $('link.theme').attr('href', path);
   }
 
@@ -266,9 +266,7 @@
           Shining.slides._loaded[name] = {};
           Shining.slides._loaded[name].markup = compileSlide(name, data);
           trigger('slideloaded', [name]);
-          if (data) {
-            loadSlideScript(name, afterLoad);
-          }
+          if (data) { loadSlideScript(name, afterLoad) };
         }
       );
     } else {
@@ -281,6 +279,7 @@
   }
 
   function playSlide(name) {
+    Shining.scripts.reap();
     var slide = Shining.slides._loaded[name];
     Shining.slides.current(name);
     $('#stage .contents').html(slide.markup);
@@ -303,6 +302,7 @@
   function loadSlideScript(name, afterLoad) {
     $.ajax({
       url: slidePath(slidePlusExtension(name, 'js')),
+      dataType: 'text',
       type: 'GET',
       success: function(script) { Shining.slides._loaded[name].script = script },
       complete: function()      { if ($.isFunction(afterLoad)) afterLoad.call() }
@@ -339,14 +339,16 @@
   function bindEvents() {
     when('previous',  function() { 
       help('←');
-      document.location.hash = Shining.slides.previous();
+      if (Shining.slides.previous()) { document.location.hash = Shining.slides.previous() }
     });
     when('next',      function() { 
       help('→');
       if ($('#stage .step:not(:visible)').length) {
-        $('#stage .step:not(:visible):first').show()
+        var step = $('#stage .step:not(:visible):first');
+        step.show();
+        trigger('step', [step])
       } else {
-        document.location.hash = Shining.slides.next();
+        if (Shining.slides.next()) { document.location.hash = Shining.slides.next() };
       }
     });
     when('slideplay', function() { loadSlideStyle(arguments[1]) });

data/shining.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shining}
-  s.version = "1.3.6"
+  s.version = "1.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julio Cesar Ody"]
-  s.date = %q{2010-07-12}
+  s.date = %q{2010-07-13}
   s.default_executable = %q{shine}
   s.description = %q{HTML + CSS + Javascript = awesome presos}
   s.email = %q{julio.ody@gmail.com}

data/themes/slidedown.css

@@ -1,9 +1,14 @@
-body          { background-color: rgb(255, 255, 255) }
-#stage        { color: rgb(0, 0, 0) }
+body          { background-color: #FFFFFF }
+#stage        { display: block; margin: 0; padding: 0 2em; color: #000000 }
 
-h1, h2, h3, p, li { color: rgb(238, 238, 238); text-shadow: rgb(0, 0, 0) 2px 2px 4px }
-a                 { color: rgb(73, 157, 255) }
+/* override centered */
+#stage h1, h2, h3 { text-align: left; margin: 0 }
+#stage p          { text-align: left; margin: 0 }
+
+a                 { color: #499DFF }
+ul, ol            { list-style-position: inside }
 ul                { list-style-type: disc }
+ol                { list-style-type: decimal }
 
-em            { color: rgb(73, 255, 80) }
-strong        { color: rgb(255, 171, 73); font-weight: bold }
+em            { color: #49FF50 }
+strong        { color: #FFAB49; font-weight: bold }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shining
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 3
-  - 6
-  version: 1.3.6
+  - 7
+  version: 1.3.7
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 +10:00
+date: 2010-07-13 00:00:00 +10:00
 default_executable: shine
 dependencies: 
 - !ruby/object:Gem::Dependency