prez 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13415316b5dd25295ffe13e8beeb11fd298be3fd
-  data.tar.gz: 40e50b72d184a9dee9860bcfeb88138325dc760b
+  metadata.gz: 61bd46e9dbbcaa94c63e40f43c90798044fe6b9f
+  data.tar.gz: e9864049a4427603b161277065a74c28ab2e43f5
 SHA512:
-  metadata.gz: 32fcb1f65a52968389fc0641a002079807cd328f278854e5b19da0b4b748119c381a37e9edc67a88873d3c9fba67f661577feee1dad88cdbcf50c1f0f3ca21cb
-  data.tar.gz: 26d7be1f411008d9fe81a9a55894d950202b0ddad08f182e3273063dd82d1c4f5056c57874ef6e9ad7d13fda0c8608e69525de26f91f83bd9535cc74c65702e1
+  metadata.gz: 7bfb70b26ef52434c4f070fe251ef92fd8ba3504826bb88193b042cc9494a54137933f7872ad9486b157930ddf9ef356c9fb5133a2cd35733e0795a8a281393f
+  data.tar.gz: 3752d8e50eba7f00b3bc78778a04b2f664a780883bb2c256e4434e60d1c4df631847c6dd3826f66e8184c1a7324133b0e9eb57f4c755404777c0cbbb58f46655

data/lib/prez.rb

@@ -1,14 +1,15 @@
 module Prez
-  autoload :Assets,  "prez/assets"
-  autoload :Build,   "prez/build"
-  autoload :Builder, "prez/builder"
-  autoload :Cache,   "prez/cache"
-  autoload :CLI,     "prez/cli"
-  autoload :DataUri, "prez/data_uri"
-  autoload :Error,   "prez/error"
-  autoload :Files,   "prez/files"
-  autoload :Helpers, "prez/helpers"
-  autoload :New,     "prez/new"
-  autoload :Start,   "prez/start"
-  autoload :Version, "prez/version"
+  autoload :Assets,            "prez/assets"
+  autoload :Build,             "prez/build"
+  autoload :Builder,           "prez/builder"
+  autoload :Cache,             "prez/cache"
+  autoload :CLI,               "prez/cli"
+  autoload :DataUri,           "prez/data_uri"
+  autoload :Error,             "prez/error"
+  autoload :Files,             "prez/files"
+  autoload :Helpers,           "prez/helpers"
+  autoload :JavascriptElement, "prez/javascript_element"
+  autoload :New,               "prez/new"
+  autoload :Start,             "prez/start"
+  autoload :Version,           "prez/version"
 end

data/lib/prez/assets.rb

@@ -72,6 +72,10 @@ module Prez
           attributes << %{height="#{options[:height]}"}
         end
 
+        if options[:id]
+          attributes << %{id="#{options[:id]}"}
+        end
+
         if options[:style]
           attributes << %{style="#{options[:style]}"}
         end

data/lib/prez/helpers.rb

@@ -5,6 +5,7 @@ module Prez
     protected
 
     def reset_helpers!
+      @launch = :choose
       @duration = nil
     end
 
@@ -50,6 +51,18 @@ module Prez
       end
     end
 
+    def launch(new_window: true)
+      if new_window
+        @launch = :new_window
+      else
+        @launch = :current_window
+      end
+    end
+
+    def launch_type
+      @launch
+    end
+
     def html_escape(value = nil, &block)
       if block
         value = capture &block
@@ -76,6 +89,7 @@ module Prez
 
     def slide(options = {})
       classes = ["prez-slide"]
+      classes << options[:class] if options[:class]
       align = options.fetch :align, :center
 
       case align
@@ -84,27 +98,53 @@ module Prez
       when :right
         classes << "right-aligned"
       when :center
-        # Nothing needed
+        classes << "center-aligned"
       else
         raise Prez::Error.new("Invalid slide align: #{align.inspect}")
       end
 
+      attributes = [%{class="#{classes.join " "}"}]
+
+      if options[:id]
+        attributes << %{id="#{options[:id]}"}
+      end
+
+      if options[:style]
+        attributes << %{style="#{options[:style]}"}
+      end
+
       if options[:duration]
-        duration_attribute = %{ data-duration="#{options[:duration]}"}
+        attributes << %{data-duration="#{options[:duration]}"}
       end
 
-      concat %{<div class="#{classes.join " "}"#{duration_attribute}>}
+      concat %{<div #{attributes.join " "}>}
       yield
       concat %{</div>}
     end
 
     def element(options = {})
       tag = options.fetch :tag, :div
-      concat %{<#{tag} class="prez-element">}
+      classes = ["prez-element"]
+      classes << options[:class] if options[:class]
+      attributes = [%{class="#{classes.join " "}"}]
+
+      if options[:id]
+        attributes << %{id="#{options[:id]}"}
+      end
+
+      if options[:style]
+        attributes << %{style="#{options[:style]}"}
+      end
+
+      concat %{<#{tag} #{attributes.join " "}>}
       yield
       concat %{</#{tag}>}
     end
 
+    def element_js(up:, down:)
+      concat Prez::JavascriptElement.new(capture(&up), capture(&down)).to_s
+    end
+
     def notes
       concat %{<div class="prez-notes">}
       yield

data/lib/prez/javascript_element.rb

@@ -0,0 +1,31 @@
+module Prez
+  class JavascriptElement
+    def self.next_id
+      @next_id ||= 0
+      @next_id += 1
+    end
+
+    def initialize(up, down)
+      @id = Prez::JavascriptElement.next_id
+      @up_js = up
+      @down_js = down
+    end
+
+    def to_s
+      <<-EOF
+        <script>
+          window.elementJs = window.elementJs || {};
+
+          window.elementJs.up#{@id} = function($) {
+            #{@up_js}
+          };
+
+          window.elementJs.down#{@id} = function($) {
+            #{@down_js}
+          };
+        </script>
+        <span class="prez-element" data-element-js data-element-js-up="up#{@id}" data-element-js-down="down#{@id}"></span>
+      EOF
+    end
+  end
+end

data/lib/prez/version.rb

@@ -2,7 +2,7 @@ module Prez
   module Version
     class << self
       def to_s
-        "0.1.0"
+        "0.1.1"
       end
     end
   end

data/templates/build.html.tt

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" data-launch-type="<%= launch_type %>">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -85,6 +85,29 @@
           </div>
         </div>
       </div>
+
+      <div id="new-window-popup-blocked-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="popup-blocked" aria-hidden="true">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+              <h4 class="modal-title" id="popup-blocked">Popup Blocked</h4>
+            </div>
+
+            <div class="modal-body">
+              <p>
+                Sorry, but your new presentation was blocked! Please click
+                'Launch' to try again, or just dismiss this modal.
+              </p>
+            </div>
+
+            <div class="modal-footer">
+              <button type="button" class="btn btn-primary" id="launch-after-blocked">Launch</button>
+              <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </body>
 </html>

data/vendor/javascripts/prez-controller.js.coffee

@@ -87,13 +87,14 @@ class Prez
             @slideStarted $next
 
         if nextElement == 0
-            $next.find(".prez-element").addClass("hidden").removeClass("visible")
+            $next.find(".prez-element").each (i, e) =>
+                @hideElement $(e)
         else if @currentElement() > nextElement
             for i in [@currentElement()..(nextElement + 1)]
-                $next.find(".prez-element[data-slide-element='#{i}']").addClass("hidden").removeClass("visible")
+                @hideElement $next.find(".prez-element[data-slide-element='#{i}']")
         else if @currentElement() < nextElement
             for i in [(@currentElement() + 1)..nextElement]
-                $next.find(".prez-element[data-slide-element='#{i}']").removeClass("hidden").addClass("visible")
+                @showElement $next.find(".prez-element[data-slide-element='#{i}']")
 
         # Hack to fix Chrome sometimes not rendering opacity changes,
         # thanks to http://stackoverflow.com/a/8840703/122
@@ -103,6 +104,18 @@ class Prez
         @options.slideChanged? $next, nextValue, nextElement
         true
 
+    hideElement: ($element) ->
+        if $element.is(".visible[data-element-js]")
+            @window.elementJs[$element.data("element-js-down")]($)
+
+        $element.addClass("hidden").removeClass("visible")
+
+    showElement: ($element) ->
+        if $element.is(".hidden[data-element-js]")
+            @window.elementJs[$element.data("element-js-up")]($)
+
+        $element.removeClass("hidden").addClass("visible")
+
     currentSlide: ->
         return null if $(".prez-slide:visible", @document).size() == 0
         parseInt $(".prez-slide:visible", @document).data("slide"), 10
@@ -245,6 +258,11 @@ $(document).on "click", "#new-window", (e) ->
             $("#new-window #launch-message").text "Launch in this window"
             $("#new-window .glyphicon").removeClass("glyphicon-new-window").addClass("glyphicon-unchecked")
 
+$(document).on "click", "#launch-after-blocked", (e) ->
+    e.preventDefault()
+    $("#new-window-popup-blocked-modal").modal "hide"
+    $("#launch").click()
+
 $(document).on "click", "#launch", (e) ->
     e.preventDefault()
     return if Prez.current
@@ -261,6 +279,12 @@ $(document).on "click", "#launch", (e) ->
 
 
     if useNewWindow
+        newWindow = window.open("", "prez", "width=640,height=480")
+
+        unless newWindow
+            $("#new-window-popup-blocked-modal").modal "show"
+            return
+
         iframePrez = new Prez
             window: iframe.getFrameWindow()
             useHash: false
@@ -268,7 +292,7 @@ $(document).on "click", "#launch", (e) ->
 
         Prez.current = new Prez
             duration: Prez.timeToSeconds($("#prez-duration").val())
-            window: window.open("", "prez", "width=640,height=480")
+            window: newWindow
             slideChanged: ($slide, slideNumber, elementNumber) ->
                 notes = $slide.find(".prez-notes").html() || ""
                 $("#slide-notes").html notes
@@ -329,3 +353,13 @@ $(window).bind "beforeunload", ->
 
 $(document).on "keydown", Prez.handlers.keyDown
 $.setInterval 50, Prez.handlers.timeChange
+
+$ ->
+    launchType = $("html").data("launch-type")
+
+    if launchType == "new_window"
+        $("#new-window").addClass("active");
+        $("#launch").click()
+    else if launchType == "current_window"
+        $("#new-window").removeClass("active");
+        $("#launch").click()

data/vendor/stylesheets/prez.scss

@@ -23,29 +23,17 @@ body {
 }
 
 .prez-slide {
-    &, & input {
+    &, input, table {
         font-size: 50;
     }
 
     display: none;
     min-height: $prez-slide-min-height;
     padding: $prez-padding;
-    text-align: center;
-
-    .center-aligned {
-        text-align: center;
-    }
-
-    &.left-aligned, .left-aligned {
-        text-align: left;
-    }
-
-    .left-aligned {
-        padding-left: 5%;
-    }
 
-    &.right-aligned, .right-aligned {
-        text-align: right;
+    table td {
+        padding-left: 3%;
+        padding-right: 3%;
     }
 
     .prez-element.hide-style.hidden {
@@ -57,6 +45,38 @@ body {
     }
 }
 
+.center-aligned, .prez-slide .center-aligned {
+    text-align: center;
+}
+
+.center-aligned table, .prez-slide table.center-aligned {
+    margin: 0 auto;
+}
+
+.left-aligned, .prez-slide .left-aligned {
+    text-align: left;
+}
+
+.left-aligned table, .prez-slide table.left-aligned {
+    margin: 0;
+}
+
+.left-aligned {
+    padding-left: 5%;
+}
+
+.right-aligned, .prez-slide .right-aligned {
+    text-align: right;
+}
+
+.right-aligned table, .prez-slide table.right-aligned {
+    margin: 0 0 0 auto;
+}
+
+.right-aligned {
+    padding-right: 5%;
+}
+
 .pre {
     font-family: monospace;
     font-size: 0.9em;
@@ -88,6 +108,10 @@ body {
     font-weight: bold;
 }
 
+.strikeout {
+    text-decoration: line-through;
+}
+
 dt {
     font-weight: bold;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prez
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -141,6 +141,7 @@ files:
 - lib/prez/error.rb
 - lib/prez/files.rb
 - lib/prez/helpers.rb
+- lib/prez/javascript_element.rb
 - lib/prez/new.rb
 - lib/prez/sass_extensions.rb
 - lib/prez/start.rb