shining 1.1.8 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.8
+1.2.0

data/lib/jquery.shining.js

@@ -13,8 +13,11 @@
       all:      function() { return this._slides },
       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() { 
+      next:     function() {
+        window.sli = this._slides;
+        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();
       },
@@ -72,7 +75,7 @@
           break;
       }
     }
-    
+
     function slice() {
       var width = $('#stage').width() / 10;
       for (var i = 0; i <= 10; i++) {
@@ -82,23 +85,23 @@
             left: (i * width) - 10
           }).delay(i * 100).animate({width: width + 1})
         );
-      }      
+      }
     }
-    
+
     function unslice() {
       var reversed = Array.prototype.reverse.call($('#stage .slice'));
       for (var i = 0; i < reversed.length; i++) {
         $(reversed[i]).delay(i * 100).animate({width: '0'})
       }
     }
-    
+
     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.effect = function(name) { return this.each(function() { applyEffect(this, name) }); };
     $.fn.hasClasses = function(classes) {
       var classes = classes.split(/\s+/), yes = true, element = this.get(0);
       for (var i = 0; i < classes.length && yes; i++) { yes = $(element).hasClass(classes[i]) }
@@ -108,19 +111,20 @@
     $.extend($.shining, {
       firstSlide:     function() { getSlide($.shining.slides.first()) },
       lastSlide:      function() { getSlide($.shining.slides.last() ) },
-      nextSlide:      function() { 
+      nextSlide:      function() {
         if ($.shining.slides.next()) {
           document.location.hash = $.shining.slides.next();
           trigger('next');
         }
       },
-      previousSlide:  function() { 
+      previousSlide:  function() {
         if ($.shining.slides.previous()) {
           document.location.hash = $.shining.slides.previous();
           trigger('previous');
         }
       },
-      getSlide:       function(slide) { getSlide(slide) }
+      getSlide:       function(slide) { getSlide(slide) },
+      help: help
     });
 
     var FILTERS = {
@@ -130,33 +134,30 @@
 
     function init() {
       $(document).ready(function() {
+        $(window).resize(function() { $('#stage').centralize() });
         $('#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); 
-        parseEffects();
-        trigger('init.shining');
-        help('← (previous slide), → or SPACE BAR (next slide)', 3000);
+        bindKeys();
+        loadConfig(function() {
+          var startAt = document.location.hash.replace('#', ''),
+            first = startAt ? startAt : $.shining.slides.current();
+          loadSlide(first, function() { playSlide(first) });
+          if (!local() && !($.shining.config.help == false)) preloadSlides();
+          setTitle($.shining.config.title);
+          setTheme($.shining.config.theme);
+          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,14 +171,14 @@
       applyTransition(
         function() { loadSlide(name, function() { playSlide(name) }) },
         function() {
-          $.shining.scripts.run($.shining.slides._loaded[$.shining.slides.current()].script) 
+          $.shining.scripts.run($.shining.slides._loaded[$.shining.slides.current()].script)
         }
       )
     }
 
     function setTitle(title) {
-      if (!title) { return false };
-      $('title').text(title);
+      if (!title || title == '') return false;
+      $.browser.msie ? document.title = title : $('title').text(title);
     }
 
     function setTheme(name) {
@@ -189,7 +190,7 @@
     function slide(name) {
       return 'slides/' + name;
     }
-    
+
     function loadSlide(name, afterLoad) {
       if (!$.shining.slides.loaded(name)) {
         $.get(
@@ -202,19 +203,19 @@
               loadSlideStyle(name);
             }
           }
-        );        
+        );
       } else {
         if ($.isFunction(afterLoad)) afterLoad.call();
-        loadSlideStyle(name);        
+        loadSlideStyle(name);
       }
     }
-    
+
     function preloadSlides() {
       $($.shining.config.slides).each(function() {
         loadSlide(this);
       })
     }
-    
+
     function playSlide(name) {
       var slide = $.shining.slides._loaded[name];
       $('#stage .contents').html(slide.markup);
@@ -229,7 +230,7 @@
           $.shining.slides._loaded[name].script = script;
         },
         complete: function() {
-          if ($.isFunction(afterLoad)) afterLoad.call();  
+          if ($.isFunction(afterLoad)) afterLoad.call();
         }
       })
     }
@@ -246,9 +247,9 @@
         callback.call();
       });
     }
-    
+
     function bindKeys() {
-      $(window).keydown(function(event) {
+      $(document).keydown(function(event) {
         switch(event.keyCode) {
           case KEY.RIGHT:
           case KEY.SPACE:
@@ -260,7 +261,7 @@
         }
       })
     }
-    
+
     function help(message, duration) {
       if ($.shining.config.help == false) return false;
       var duration = duration || 500;
@@ -273,17 +274,11 @@
         .delay(duration)
         .fadeOut(200, function() { $('#help').remove() })
     }
-    
+
     function local() {
       document.location.protocol == 'file:'
     }
 
-    function parseEffects() {
-      $.get($('link[href$=effects.css]').attr('href'),
-        function(css) { $.shining.effects = $.parseCSS(css) }
-      );
-    }
-
     $.shining.scripts = {
       LINE: /^(\d[.\d]*),[\s]*(.*)/,
       parsed: [], processes: [],
@@ -323,9 +318,9 @@
         return $.shining.scripts.processes = [];
       }
     }
-    
-    bind('previous', function() { help('←') });
-    bind('next', function() { help('→') });
+
+    bind('previous',  function() { help('←') });
+    bind('next',      function() { help('→') });
 
     init();
   }
@@ -347,17 +342,6 @@
 // centralizes an element vertically
 (function($){$.fn.centralize=function(){var self=this.get(0);windowHeight=document.documentElement.clientHeight,elementHeight=(self.offsetHeight+$(self).padding().top+$(self).padding().bottom);$(self).css('position','relative').css('top',(windowHeight/2)-(elementHeight/2)+'px');};})(jQuery);
 
-// Trimmed down/modified version of the original Javascript/jQuery CSS parser
-// by Danny.
-// http://bililite.com/blog/2009/01/16/jquery-css-parser/
-(function($){$.parseCSS=function(str){var ret={};str=munge(str).replace(/@(([^;`]|`[^b]|`b[^%])*(`b%)?);?/g,function(s,rule){return'';});$.each(str.split('`b%'),function(i,css){css=css.split('%b`');if(css.length<2)return;css[0]=restore(css[0]);ret[css[0]]=$.extend(ret[css[0]]||{},parsedeclarations(css[1]));});return ret;};$.parseCSS.mediumApplies=(window.media&&window.media.query)||function(str){if(!str)return true;if(str in media)return media[str];var style=$('<style media="'+str+'">body {position: relative; z-index: 1;}</style>').appendTo('head');return media[str]=[$('body').css('z-index')==1,style.remove()][0];};$.parseCSS.parseArguments=function(str){if(!str)return[];var ret=[],mungedArguments=munge(str,true).split(/\s+/);for(var i=0;i<mungedArguments.length;++i){var a=restore(mungedArguments[i]);try{ret.push(eval('('+a+')'));}catch(err){ret.push(a);}}
-return ret;};var media={};var munged={};function parsedeclarations(index){var str=munged[index].replace(/^{|}$/g,'');str=munge(str);var parsed={};$.each(str.split(';'),function(i,decl){decl=decl.split(':');if(decl.length<2)return;parsed[restore(decl[0])]=restore(decl[1]);});return parsed;}
-var REbraces=/{[^{}]*}/,REfull=/\[[^\[\]]*\]|{[^{}]*}|\([^()]*\)|function(\s+\w+)?(\s*%b`\d+`b%){2}/,REatcomment=/\/\*@((?:[^\*]|\*[^\/])*)\*\//g,REcomment_string=/(?:\/\*(?:[^\*]|\*[^\/])*\*\/)|(\\.|"(?:[^\\\"]|\\.|\\\n)*"|'(?:[^\\\']|\\.|\\\n)*')/g,REmunged=/%\w`(\d+)`\w%/,uid=0;function munge(str,full){str=str.replace(REatcomment,'$1').replace(REcomment_string,function(s,string){if(!string)return'';var replacement='%s`'+(++uid)+'`s%';munged[uid]=string.replace(/^\\/,'');return replacement;});var RE=full?REfull:REbraces;while(match=RE.exec(str)){replacement='%b`'+(++uid)+'`b%';munged[uid]=match[0];str=str.replace(RE,replacement);}
-return str;}
-function restore(str){if(str===undefined)return str;while(match=REmunged.exec(str)){str=str.replace(REmunged,munged[match[1]]);}
-return $.trim(str);}
-var RESGMLcomment=/<!--([^-]|-[^-])*-->/g;var REnotATag=/(>)[^<]*/g;var REtag=/<(\w+)([^>]*)>/g;})(jQuery);
-
 /*
  * jQuery hashchange event - v1.2 - 2/11/2010
  * http://benalman.com/projects/jquery-hashchange-plugin/
@@ -368,7 +352,10 @@ var RESGMLcomment=/<!--([^-]|-[^-])*-->/g;var REnotATag=/(>)[^<]*/g;var REtag=/<
  */
 (function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);
 
+// IE Array.prototype.indexOf fix
+if(!Array.prototype.indexOf){Array.prototype.indexOf=function(elt,from){var len=this.length;var from=Number(arguments[1])||0;from=(from<0)?Math.ceil(from):Math.floor(from);if(from<0)from+=len;for(;from<len;from++){if(from in this&&this[from]===elt)return from;} return-1;};}
+
 $(window).bind('hashchange', function(event) {
   var slide = document.location.hash.replace('#', '');
   if (slide) { $.shining.getSlide(slide) };
-});
+});

data/lib/shining.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__))
+$:.unshift File.dirname(__FILE__)
 
 require 'rubygems'
 require 'ext/string'
@@ -6,14 +6,12 @@ require 'ext/filemethods'
 require 'shining/preso'
 require 'shining/player'
 require 'shining/heroku'
-require 'term/ansicolor'
 
 module Shining
-  extend Term::ANSIColor
   
   class << self
     def say something
-      STDOUT.puts(blue(something)) unless defined?(Spec) # shush when running tests
+      STDOUT.puts(something) unless defined?(Spec) # shush when running tests
       yield if block_given?
     end
 

data/shining.gemspec

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

data/templates/index.html

@@ -14,8 +14,8 @@
     <script type="text/javascript" charset="utf-8" src="<%= vendorized? ? 'vendor' : Shining.root %>/lib/jquery.shining.js"></script>
   </head>
   <body>
-    <section id="stage">
+    <div id="stage">
       <div class="contents"></div>
-    </section>
+    </div>
   </body>
 </html>

data/themes/default.css

@@ -1,4 +1,6 @@
-body          { background-color: rgb(48, 48, 48) }
+body          {
+  background-color: #303030;
+}
 #stage        { 
   -webkit-box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.6);
   -webkit-border-radius: 5px;
@@ -8,9 +10,15 @@ body          { background-color: rgb(48, 48, 48) }
   border-radius: 5px;  
 }
 
-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); text-decoration: none }
-ul                { list-style-type: disc }
+h1, h2, h3, p, li { 
+  color: #EEEEEE;
+  text-shadow: #000 2px 2px 4px
+}
+a                 { 
+  color: #499DFF;
+  text-decoration: none 
+}
+ul            { list-style-type: disc }
 
 em            { color: rgb(73, 255, 80) }
 strong        { color: rgb(255, 171, 73); font-weight: bold }

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 8
-  version: 1.1.8
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 +10:00
+date: 2010-04-23 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency