shining 1.1.5 → 1.1.7

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.7

data/lib/jquery.shining.js

@@ -109,12 +109,16 @@
       firstSlide:     function() { getSlide($.shining.slides.first()) },
       lastSlide:      function() { getSlide($.shining.slides.last() ) },
       nextSlide:      function() { 
-        getSlide($.shining.slides.next());
-        trigger('next');
+        if ($.shining.slides.next()) {
+          document.location.hash = $.shining.slides.next();
+          trigger('next');
+        }
       },
       previousSlide:  function() { 
-        getSlide($.shining.slides.previous());
-        trigger('previous');
+        if ($.shining.slides.previous()) {
+          document.location.hash = $.shining.slides.previous();
+          trigger('previous');
+        }
       },
       getSlide:       function(slide) { getSlide(slide) }
     });
@@ -126,11 +130,6 @@
 
     function init() {
       $(document).ready(function() {
-        $('#controls').ondistance(
-          300,
-          function(controls) { $(controls).effect('fades-in') },
-          function(controls) { $(controls).effect('fades-out') }
-        );
         $('#stage').centralize();
       });
       $(window).resize(function() { $('#stage').centralize() });
@@ -143,7 +142,6 @@
         setTitle($.shining.config.title);
         setTheme($.shining.config.theme); 
         parseEffects();
-        updateControlAnchors();
         trigger('init.shining');
         help('← (previous slide), → or SPACE BAR (next slide)', 3000);
       });
@@ -206,7 +204,7 @@
           }
         );        
       } else {
-        afterLoad.call()
+        if ($.isFunction(afterLoad)) afterLoad.call();
         loadSlideStyle(name);        
       }
     }
@@ -221,7 +219,6 @@
       var slide = $.shining.slides._loaded[name];
       $('#stage .contents').html(slide.markup);
       $.shining.scripts.run(slide.script);
-      updateControlAnchors();
     }
 
     function loadSlideScript(name, afterLoad) {
@@ -287,13 +284,6 @@
       );
     }
 
-    function updateControlAnchors() {
-      $('#controls #first').    attr('href', '#' + $.shining.slides.first());
-      $('#controls #previous'). attr('href', ($.shining.slides.previous() ? '#' + $.shining.slides.previous() : ''));
-      $('#controls #next').     attr('href', ($.shining.slides.next() ? '#' + $.shining.slides.next() : ''));
-      $('#controls #last').     attr('href', '#' + $.shining.slides.first());
-    }
-
     $.shining.scripts = {
       LINE: /^(\d[.\d]*),[\s]*(.*)/,
       parsed: [], processes: [],
@@ -354,10 +344,6 @@
  */
 (function(b){var a=function(c){return parseInt(c,10)||0};b.each(["min","max"],function(d,c){b.fn[c+"Size"]=function(g){var f,e;if(g){if(g.width!==undefined){this.css(c+"-width",g.width)}if(g.height!==undefined){this.css(c+"-height",g.height)}return this}else{f=this.css(c+"-width");e=this.css(c+"-height");return{width:(c==="max"&&(f===undefined||f==="none"||a(f)===-1)&&Number.MAX_VALUE)||a(f),height:(c==="max"&&(e===undefined||e==="none"||a(e)===-1)&&Number.MAX_VALUE)||a(e)}}}});b.fn.isVisible=function(){return this.is(":visible")};b.each(["border","margin","padding"],function(d,c){b.fn[c]=function(e){if(e){if(e.top!==undefined){this.css(c+"-top"+(c==="border"?"-width":""),e.top)}if(e.bottom!==undefined){this.css(c+"-bottom"+(c==="border"?"-width":""),e.bottom)}if(e.left!==undefined){this.css(c+"-left"+(c==="border"?"-width":""),e.left)}if(e.right!==undefined){this.css(c+"-right"+(c==="border"?"-width":""),e.right)}return this}else{return{top:a(this.css(c+"-top"+(c==="border"?"-width":""))),bottom:a(this.css(c+"-bottom"+(c==="border"?"-width":""))),left:a(this.css(c+"-left"+(c==="border"?"-width":""))),right:a(this.css(c+"-right"+(c==="border"?"-width":"")))}}}})})(jQuery);
 
-
-// http://github.com/juliocesar/jquery-ondistance
-(function($){$.fn.ondistance=function(specified,close,far){var elt=this.get(0),last=new Date().getTime();$(document).mousemove(function(e){var current=new Date().getTime();if(current-last<500)return;var offset=$(elt).offset(),center={x:offset.left+($(elt).width()/2),y:offset.top+($(elt).height()/2)},last=current,distance=parseInt(Math.sqrt(Math.pow(e.pageX-center.x,2)+Math.pow(e.pageY-center.y,2)));if(specified>=distance){if($(elt).data('mouseclose')==true)return false;$(elt).data('mouseclose',true);close(elt);}else{if($(elt).data('mouseclose')==false)return false;$(elt).data('mouseclose',false);far(elt);}})}})(jQuery);
-
 // 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);
 

data/shining.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shining}
-  s.version = "1.1.5"
+  s.version = "1.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julio Cesar Ody"]
@@ -79,7 +79,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/juliocesar/shining}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Webkit + CSS + Javascript = awesome presos}
   s.test_files = [
     "spec/cli_spec.rb",

data/templates/index.html

@@ -17,11 +17,5 @@
     <section id="stage">
       <div class="contents"></div>
     </section>
-    <nav id="controls" class="transparent">
-      <a id="first"><<</a>
-      <a id="previous"><</a>
-      <a id="next">></a>
-      <a id="last">>></a>
-    </nav>
   </body>
 </html>

data/themes/default.css

@@ -12,18 +12,5 @@ h1, h2, h3, p, li { color: rgb(238, 238, 238); text-shadow: rgb(0, 0, 0) 2px 2px
 a                 { color: rgb(73, 157, 255); text-decoration: none }
 ul                { list-style-type: disc }
 
-#controls     { 
-  position: fixed; 
-  bottom: 0; 
-  left: 62%; 
-  margin-left: -300px; 
-  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) }
 strong        { color: rgb(255, 171, 73); font-weight: bold }

data/themes/slidedown.css

@@ -5,15 +5,5 @@ h1, h2, h3, p, li { color: rgb(238, 238, 238); text-shadow: rgb(0, 0, 0) 2px 2px
 a                 { color: rgb(73, 157, 255) }
 ul                { list-style-type: disc }
 
-#controls     { 
-  position: fixed; 
-  bottom: 0; 
-  left: 62%; 
-  margin-left: -300px;
-  background-color: rgba(0, 0, 0, 0.5);
-  -webkit-border-top-left-radius: 5px;
-  -webkit-border-top-right-radius: 5px;  
-}
-#controls a   { display: inline-block; width: 75px; padding: 5px 0; font-weight: bold; color: #fff; text-decoration: none }
 em            { color: rgb(73, 255, 80) }
 strong        { color: rgb(255, 171, 73); font-weight: bold }

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: shining
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -14,84 +19,115 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 17
         version: 2.2.17
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json_pure
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 9
         version: 1.1.9
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: tilt
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
         version: "0.6"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rdiscount
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 3
         version: 1.6.3
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: term-ansicolor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 4
         version: 1.0.4
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 2
+        - 0
         version: 4.2.0
-    version: 
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-    version: 
+  type: :development
+  version_requirements: *id008
 description: Webkit + CSS + Javascript = awesome presos
 email: julio.ody@gmail.com
 executables: 
@@ -173,18 +209,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Webkit + CSS + Javascript = awesome presos