alongslide 0.9.8 → 0.9.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQwYjM1MzE0NDVmMTE0NDc2MDMzMDJiYmU2NTM2MDhjZmJhNWZkMg==
+    ZjhiZDM3YTNiNWYyYWI0N2IzNGIwNGU1ZmEyOWMyZjkyZTg1NjZiYQ==
   data.tar.gz: !binary |-
-    NGZhNzFkOGE5MWQ1ODNmMmFmZDRhOGEyMDFkZDRiOTVlNTQwMTQyNQ==
+    YmMxZGM2YWJlMzQwYjRkYjc2Y2E3YmM1MTM1M2Q2NjFiYWNmY2ZjYg==
 SHA512:
   metadata.gz: !binary |-
-    NDhmZjBkMzNhN2I1ZTgwOTkzNjRkYWJiODI0ZWFlYTBhZmE2ZjNhNjlmNmYw
-    YjQyZmU0NmI0MTBlZmVhNTc0ZWQ4ZTYxYWYzM2U1Zjc5MzQzNGU4ODgzMmQ5
-    ZmE4NjJkOWY4YjNjMjAxYjM1NmE1YjQwMTM4Y2UwNjdhNWIwODA=
+    OTNjZGZiNDA0YzJhYjc0NDEzYmFiNThiOTUwM2JjYjhhMjFmNDJmYTNhOWRl
+    MjYyZmNkYWMwZWMwZDBiNjk1NDFmNzhhM2QxZTAwODE3YzQwYzM4MmMyNjlh
+    MTBmZTU5MjU5ZTcwYmI4NTZhMDhjNGI0ZTc1OWFlNDA2MTg1Y2Q=
   data.tar.gz: !binary |-
-    NTk1Mzc3ODEyYTczYjQ1NmRjZWZhMTMzZWMzOGJiMTVlMGU5NTU3NWUyNWMw
-    MjNiMjc1MmY5MWU2MzI0OWQzZmI0YWYzOWQ1ZDQwZjlkMjJjODRiNmYwODc4
-    YzhhOTcwZWJiMjQxYTIyNzE4YjFmOWE1MDRkMTFlZWU5NTIwYWI=
+    YWE3MjYxZDQyMGZiYWIwNTM3NmIzMmVhODEyMWIwNzBhYzI0MmY5NWE1NjFj
+    NmRjNzY5MDZlZWY4YTczMjZjYTRmZDIwNDdlZDc4MDk2MTRlMmViYjQyZGE4
+    NmNjYWE1YmNmN2QxMWZhNjcwNmI5NzMzNDFlODk0ZWRhNjlkY2I=

data/alongslide.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name    = 'alongslide'
-  gem.version = '0.9.8'
+  gem.version = '0.9.9'
 
   gem.summary = "Create dynamic web layouts with an extended Markdown syntax"
   gem.description = "Create dynamic web layouts with an extended Markdown syntax"

data/app/assets/javascripts/alongslide/alongslide.coffee

@@ -17,6 +17,7 @@ class Alongslide
     @source     = $(options.source)  ? $('#content .raw')
     @frames     = $(options.to)      ? $('#frames')
     @regionCls  = options.regionCls  ? 'column'
+    @marginTop  = options.marginTop  ? 0
 
     RegionFlow::init()
 
@@ -47,7 +48,7 @@ class Alongslide
   # @param postRenderCallback - to be called when layout returns
   # 
   render: (postRenderCallback) ->
-    frameAspect = FixedAspect.prototype.fitFrame(@layout.FRAME_WIDTH)
+    frameAspect = FixedAspect.prototype.fitFrame(@layout.FRAME_WIDTH, @marginTop)
     @layout.render (lastFramePosition) =>
 
       @lastFramePosition = lastFramePosition
@@ -66,7 +67,7 @@ class Alongslide
   # Refresh Skrollr only on resize events, as it's fast.
   # 
   refresh: ->
-    frameAspect = FixedAspect.prototype.fitFrame(@layout.FRAME_WIDTH)
+    frameAspect = FixedAspect.prototype.fitFrame(@layout.FRAME_WIDTH, @marginTop)
     @scrolling.render(frameAspect, @lastFramePosition)
     FixedAspect.prototype.fitPanels(frameAspect)
 
@@ -83,16 +84,32 @@ class Alongslide
   # Sanitize Markdown generated HTML
   applyFootnotes: ->
     # For each footnote in the article
-    @frames.find('a[rel=footnote]').each (i, el) =>
+    @frames.find('.als-fn-ref').each (i, el) =>
       # Reference the footnote
       $el = $(el)
-      # Find the actual footnote
-      $footnote = @footnotes.find($el.attr('href'))
-      # Append actualy footnote to footnote reference
-      $el.parent('sup').append($footnote)
-
-      # Add event listener to pin/unpin when clicked
-      $el.on "click", (e) -> $(this).toggleClass('active')
+      # Find the footnote text
+      $footnote = @footnotes.find($el.data('anchor'))
+
+      # Append the footnote text element to the column
+      $column = $el.parents('.column')
+      $column.append($footnote)
+
+      # place footnote, prevent placing offscreen
+      bottom = $column.height() + $column.offset().top
+      if ($el.offset().top + $footnote.height()) > bottom
+        $footnote.css('bottom', 0)
+      else
+        $footnote.css('top', $el.parent().position().top )
+
+      $el.on "mouseenter click", (e) ->
+        e.preventDefault()
+        e.stopImmediatePropagation()
+        $footnote.fadeIn(150)
+        false
+
+      $footnote.on "mouseleave click", (e) -> 
+        setTimeout ( ()-> $footnote.fadeOut(150) ), 100
+        false
 
   applyAnchorScrolling: ->
     self = @

data/app/assets/javascripts/alongslide/layout.coffee

@@ -76,6 +76,9 @@ class Alongslide::Layout
     @setPositionOf background, to: @nextFramePosition() if background.length
     background.addClass('unstaged')
 
+    # Reset section index before building another section
+    @currentSectionFlowIndex = 0
+
     @renderFrame(flowName)
 
   # Render one frame and its containing columns.
@@ -93,6 +96,10 @@ class Alongslide::Layout
     while frame.find('.'+@regionCls).length < @numFrameColumns(frame)
       column = @buildRegion frame, flowName
 
+      # Give each section flow an index
+      @currentSectionFlowIndex++
+      column.find('.section').attr('data-section-flow-idx', @currentSectionFlowIndex)
+
       # Move three-columns class from .section to .frame
       hasThreeColumns = (column.children('.three-columns').length)
       if hasThreeColumns

data/app/assets/javascripts/alongslide/parser.coffee

@@ -114,12 +114,12 @@ class Alongslide::Parser
       background = idElement.clone().addClass('background frame').html(" ")
       @backgrounds.push(background)
 
-  # Search for footntes as formatted by Redcarpet.
+  # Search for footntes as formatted by Redcarpet's footnotes callback
   # 
   # Each has an ID of the form `fn1`, which corresponds to the links in the
   # footnote references.
   # 
-  # Returns a jQuery list of li elements and removes the generated footnotes from DOM
+  # Returns a DOM node whose child elements are footnote definitions and removes the generated footnotes from DOM
   collectFootnotes: ->
-    @source.find('.footnotes:last-child')
-           .remove()
+    @source.find('.als-footnotes:last')
+           .remove()

data/lib/alongslide/redcarpet/render.rb

@@ -23,6 +23,21 @@ module Redcarpet
         ::Alongslide::render_block text
       end
 
+      def footnote_def(text, number)
+        # example args
+        #
+        # "<p>Here is the text of the footnote</p>\n", 1
+        "<div id='fn#{number}' class='als-footnote'>#{text.insert(3,number.to_s+'  ')}</p></div>"
+      end
+
+      def footnotes(text)
+        "<div class='als-footnotes'>"+text+"</div>"
+      end
+
+      def footnote_ref(number)
+        "<sup id='fnref#{number}' class='als-fn-sup'><span class='als-fn-ref' data-anchor='#fn#{number}'>#{number}</span></sup>"
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alongslide
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Adam Florin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet