slideoff 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a283925d99d7189d3016753e28952ea15014410f
-  data.tar.gz: 3f75827bbf04cc0073fd4125080a68c98fdd6c49
+  metadata.gz: 292dc9e44e4bdb71dd13dec1241465452a029329
+  data.tar.gz: f9b232e08f19cd6edec6c21bbf950bf199721a54
 SHA512:
-  metadata.gz: c59a73be6e9301c96858704e6158224fd9fc42058bf00a66fb9fd13ba8636e775a8e6109d76abae76831395c3b33b3a6d11477ae47b4c4983dea1bf3cd2842db
-  data.tar.gz: 0a15722c6c4df02968202566b862a451c1ca66b4508ac8a9e8c1e3073ea11f1d13b8ec5e0f65f13e3169129905f49d5cae07a57052edb9a21ecff14dd10ac514
+  metadata.gz: 4ef62a3b328560f2d65191ac6644bb6fd35fd5066978b7cc47033710d611d6d7dd0b036e6f4dd5eeded0020f70e4f28e515ba7783eb9d869ee13564709f4943f
+  data.tar.gz: 73a568350aa9a9b942816898d277a6c6a645b503130ca2cb0f6db9d63acbcb4b5c83a1f5ae369f9fd944109bb377fad64f132e581c3c2666021c48fe99d222dc

data/lib/slideoff/presentation.rb

@@ -43,7 +43,7 @@ module Slideoff
       Dir[     "#{CONFIG.pwd}#{asset}"].first ||
         Dir[    "#{theme.dir}#{asset}"].first ||
         Dir[   "#{common.dir}#{asset}"].first ||
-        (Dir["#{CONFIG.pwd}/**#{asset}"] - Dir["#{CONFIG.static_dir}/**#{asset}"]).first
+        lookup_recursive_without_static(asset).first
     end
 
     def convert_styles(dir)
@@ -54,6 +54,12 @@ module Slideoff
 
   protected
 
+    def lookup_recursive_without_static(path)
+      found_paths = Dir["#{File.absolute_path(CONFIG.pwd)}/**#{path}"]
+      found_static_paths = Dir["#{File.absolute_path(CONFIG.static_dir)}/**#{path}"]
+      found_paths - found_static_paths
+    end
+
     def build_theme(title)
       Theme.new.tap do |t|
         dir = File.expand_path("#{CONFIG.dir}/themes/#{title}")

data/lib/slideoff.rb

@@ -11,5 +11,5 @@ module Slideoff
   autoload :FlickrAPI,       "slideoff/flickr_api"
 
   CONFIG = ConfigBuilder.new(Dir.pwd)
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/themes/modern/js/script.coffee

@@ -300,36 +300,50 @@ class Slide
 
   containsInactive: -> @firstInactiveElement().length > 0
 
+  containsCurrent: -> @firstCurrentElement().length > 0
+
+  containsVisited: -> @html().find('.visited').length > 0
+
   firstInactiveElement: -> @html().find('.inactive').first()
 
-  removePresentElement: -> @html().find('.current').first().removeClass('current')
+  firstCurrentElement: -> @html().find('.current').first()
 
-  nextInactive: ->
-    @html().removeClass('incr') unless @containsInactive()
-    element = @firstInactiveElement()
-    @html().find('.current').first().addClass('visited')
-    @removePresentElement()
+  prevInteractive: ->
+    @firstCurrentElement().removeClass('current').addClass('inactive')
+
+    unless @containsVisited()
+      @prev().goto()
+      return
+
+    @html().find('.visited').last().removeClass('visited').addClass('current')
+    @decrementStep() if @html().hasClass('step-0')
+
+  nextInteractive: ->
+    @firstCurrentElement().removeClass('current').addClass('visited')
+
+    unless @containsInactive()
+      @next().goto()
+      return
 
-    element.removeClass('inactive')
+    element = @firstInactiveElement()
+    element.removeClass('inactive').addClass('current')
     if element.is("pre[data-lang=sh] code")
       element.typewriter()
     else
-      element.addClass('current')
       @incrementStep()
 
-  resetStep: ->
-    currentHtml = Slide.current().html()
-    step = 0
-    while currentHtml.hasClass("step-#{step}")
-      currentHtml.removeClass("step-#{step}")
-      step = step + 1
+  decrementStep: ->
+    max_steps = @html().find('.step').length
+    step = max_steps
+    while step >= 0 && step <= max_steps && !@html().hasClass("step-#{step}")
+      step = step - 1
+    @html().removeClass("step-#{step}")
 
   incrementStep: ->
-    currentHtml = Slide.current().html()
     step = 0
-    while currentHtml.hasClass("step-#{step}")
+    while @html().hasClass("step-#{step}")
       step = step + 1
-    currentHtml.addClass("step-#{step}")
+    @html().addClass("step-#{step}")
 
   # private
 
@@ -366,17 +380,23 @@ class UserInterface
     Slide.last().goto()
 
   @nextStep: ->
+    return unless Mode.isSlideMode()
+
     slide = Slide.current()
-    if Mode.isSlideMode() and slide.containsInactive()
-      slide.nextInactive()
+    if slide.containsInactive() or slide.containsCurrent()
+      slide.nextInteractive()
     else
       slide.html().removeClass('incr')
-      slide.removePresentElement()
-      slide.resetStep()
       slide.next().goto()
 
   @prevStep: ->
-    Slide.current().prev().goto()
+    return unless Mode.isSlideMode()
+
+    slide = Slide.current()
+    if slide.containsVisited() or slide.containsCurrent()
+      slide.prevInteractive()
+    else
+      slide.prev().goto()
 
   @nextBigStep: ->
     Slide.current().nextSection().goto()

data/themes/modern/js/script.js

@@ -420,51 +420,67 @@ Slide = (function() {
     return this.firstInactiveElement().length > 0;
   };
 
+  Slide.prototype.containsCurrent = function() {
+    return this.firstCurrentElement().length > 0;
+  };
+
+  Slide.prototype.containsVisited = function() {
+    return this.html().find('.visited').length > 0;
+  };
+
   Slide.prototype.firstInactiveElement = function() {
     return this.html().find('.inactive').first();
   };
 
-  Slide.prototype.removePresentElement = function() {
-    return this.html().find('.current').first().removeClass('current');
+  Slide.prototype.firstCurrentElement = function() {
+    return this.html().find('.current').first();
   };
 
-  Slide.prototype.nextInactive = function() {
+  Slide.prototype.prevInteractive = function() {
+    this.firstCurrentElement().removeClass('current').addClass('inactive');
+    if (!this.containsVisited()) {
+      this.prev().goto();
+      return;
+    }
+    this.html().find('.visited').last().removeClass('visited').addClass('current');
+    if (this.html().hasClass('step-0')) {
+      return this.decrementStep();
+    }
+  };
+
+  Slide.prototype.nextInteractive = function() {
     var element;
+    this.firstCurrentElement().removeClass('current').addClass('visited');
     if (!this.containsInactive()) {
-      this.html().removeClass('incr');
+      this.next().goto();
+      return;
     }
     element = this.firstInactiveElement();
-    this.html().find('.current').first().addClass('visited');
-    this.removePresentElement();
-    element.removeClass('inactive');
+    element.removeClass('inactive').addClass('current');
     if (element.is("pre[data-lang=sh] code")) {
       return element.typewriter();
     } else {
-      element.addClass('current');
       return this.incrementStep();
     }
   };
 
-  Slide.prototype.resetStep = function() {
-    var currentHtml, step, _results;
-    currentHtml = Slide.current().html();
-    step = 0;
-    _results = [];
-    while (currentHtml.hasClass("step-" + step)) {
-      currentHtml.removeClass("step-" + step);
-      _results.push(step = step + 1);
+  Slide.prototype.decrementStep = function() {
+    var max_steps, step;
+    max_steps = this.html().find('.step').length;
+    step = max_steps;
+    while (step >= 0 && step <= max_steps && !this.html().hasClass("step-" + step)) {
+      step = step - 1;
     }
-    return _results;
+    return this.html().removeClass("step-" + step);
   };
 
   Slide.prototype.incrementStep = function() {
-    var currentHtml, step;
-    currentHtml = Slide.current().html();
+    var step;
     step = 0;
-    while (currentHtml.hasClass("step-" + step)) {
+    while (this.html().hasClass("step-" + step)) {
       step = step + 1;
     }
-    return currentHtml.addClass("step-" + step);
+    return this.html().addClass("step-" + step);
   };
 
   Slide.prototype.slideList = function() {
@@ -523,19 +539,29 @@ UserInterface = (function() {
 
   UserInterface.nextStep = function() {
     var slide;
+    if (!Mode.isSlideMode()) {
+      return;
+    }
     slide = Slide.current();
-    if (Mode.isSlideMode() && slide.containsInactive()) {
-      return slide.nextInactive();
+    if (slide.containsInactive() || slide.containsCurrent()) {
+      return slide.nextInteractive();
     } else {
       slide.html().removeClass('incr');
-      slide.removePresentElement();
-      slide.resetStep();
       return slide.next().goto();
     }
   };
 
   UserInterface.prevStep = function() {
-    return Slide.current().prev().goto();
+    var slide;
+    if (!Mode.isSlideMode()) {
+      return;
+    }
+    slide = Slide.current();
+    if (slide.containsVisited() || slide.containsCurrent()) {
+      return slide.prevInteractive();
+    } else {
+      return slide.prev().goto();
+    }
   };
 
   UserInterface.nextBigStep = function() {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slideoff
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - DSIW
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath