polyblock 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeeeeb03bb0979a5db64e06f819f6fc520858a25
-  data.tar.gz: 77c832a8820cb6ee9b96f22c0fd5e2352bd16f80
+  metadata.gz: f27f08474cb1fd485e2a694418e5514b42aea79c
+  data.tar.gz: bed9d5827e26440c09b72523f31bba79606a5206
 SHA512:
-  metadata.gz: 3dcc52a480320bccadcbd9d0c122cdf79c7bf395cf2c75adb8a32fa0d18dec3c311c563e9e565da30b5b234e2f52a8e72370394819de96262a853e10d4670ab9
-  data.tar.gz: c25ca82372826d9056618b5d578769bd16d2a5ddd5541618d6fa72b862dde795ba5b1d6d0b3129fbead57ec48e0deb4644c91b32c89193328b170b3c5eb4aba3
+  metadata.gz: 979dcaf2d0c6d455be4b2c33fb65a3ded3d056790c8af3dd455298d5ad9d2373088de83337e686ce07654e6c67be44eb76a74e9b62fd1ba07a7daa07d765f68a
+  data.tar.gz: da2764e8c43bd51ae5b91be442857eb50a5a41a65b8ed031994a753b00bd67a0b34e70c3a657b9a5641d94c2251fa76f105082ef7b7943a17e911fd0b30c753b

data/app/assets/javascripts/polyblock/polyblock.js.coffee

@@ -107,66 +107,66 @@ jQuery ($)->
           alertify.success("Your changes have been discarded.") if alertify?
 
       # Modes
-      currentMode = previousMode = "WYSIWYG"
-      convertToTextarea = (block,content=null,tab="\t")->
-        tabchars = tab.replace(/\\/,"").length
-        previous_textarea = $("textarea[data-pbid=#{block.attr("data-pbid")}]")
-        content ?= if previous_textarea.is("*") then previous_textarea.val() else block.html()
-        textarea = $('<textarea />')
-        .addClass("form-control")
-        .attr("data-pbid",block.attr("data-pbid"))
-        .val(content)
-        .css("font-family": 'Monaco, Menlo, Consolas, "Courier New", monospace')
-        .on "keydown", (e)->
-            keycode = e.keyCode or e.which
-            return unless keycode == 9 or keycode == 8 or keycode == 46
-            start = $(@).get(0).selectionStart
-            end = $(@).get(0).selectionEnd
-            if keycode == 9
-              e.preventDefault()
-              $(@).val("#{$(@).val().substring(0,start)}#{tab}#{$(@).val().substring(end)}")
-              $(@).get(0).selectionStart = $(@).get(0).selectionEnd = start + tabchars
-            else if keycode == 8
-              return unless currentMode=="HAML" and $(@).val().substring(start-tabchars,start) == tab
-              e.preventDefault()
-              $(@).val("#{$(@).val().substring(0,start-tabchars)}#{$(@).val().substring(end)}")
-              $(@).get(0).selectionStart = $(@).get(0).selectionEnd = start-tabchars
-            else if keycode == 46
-              return unless currentMode=="HAML" and $(@).val().substring(start,start+tabchars) == tab
-              e.preventDefault()
-              $(@).val("#{$(@).val().substring(0,start)}#{$(@).val().substring(end+tabchars)}")
-              $(@).get(0).selectionStart = $(@).get(0).selectionEnd = start
-        replaceIt = (html)=>
-          if !previous_textarea.is("*") then block.replaceWith(textarea)
-          else previous_textarea.replaceWith(textarea)
-          textarea.autosize().focus()
-        if previousMode != "HAML" then replaceIt(content)
-        else $.post "/convert_haml_to_html", {haml: content}, (data)=> replaceIt(data)
-      convertFromTextarea = (block)->
-        textarea = $("textarea[data-pbid=#{block.attr("data-pbid")}]")
-        replaceIt = (html)=>
-          console.log "Replacing with html: #{html}"
-          textarea.replaceWith(block)
-          block.html(html)
-        if previousMode != "HAML" then replaceIt(textarea.text())
-        else $.post "/convert_haml_to_html", {haml: textarea.val()}, (data)=> replaceIt(data)
-
-      $('#pb_bar_format_buttons button').click (e)->
-        e.preventDefault()
-        return if $(@).hasClass("active")
-        previousMode = currentMode
-        currentMode = $(@).html()
-        changeModes = (block)=>
-          textarea = $("textarea[data-pbid=#{block.attr("data-pbid")}]")
-          content = if textarea.is("*") then textarea.val() else block.html()
-          switch currentMode
-            when "WYSIWYG" then convertFromTextarea block
-            when "HTML" then convertToTextarea block, html_beautify(content)
-            when "HAML" then $.post "/convert_html_to_haml", {html: content}, (data)=> convertToTextarea(block,data,"  ")
-            when "Markdown" then convertToTextarea block, html_beautify(content)
-        blocks = fetch_blocks() if previousMode == "WYSIWYG"
-        blocks.each -> changeModes $(@)
-        $(@).siblings().removeClass("active").end().addClass("active")
+      # currentMode = previousMode = "WYSIWYG"
+      # convertToTextarea = (block,content=null,tab="\t")->
+      #   tabchars = tab.replace(/\\/,"").length
+      #   previous_textarea = $("textarea[data-pbid=#{block.attr("data-pbid")}]")
+      #   content ?= if previous_textarea.is("*") then previous_textarea.val() else block.html()
+      #   textarea = $('<textarea />')
+      #   .addClass("form-control")
+      #   .attr("data-pbid",block.attr("data-pbid"))
+      #   .val(content)
+      #   .css("font-family": 'Monaco, Menlo, Consolas, "Courier New", monospace')
+      #   .on "keydown", (e)->
+      #       keycode = e.keyCode or e.which
+      #       return unless keycode == 9 or keycode == 8 or keycode == 46
+      #       start = $(@).get(0).selectionStart
+      #       end = $(@).get(0).selectionEnd
+      #       if keycode == 9
+      #         e.preventDefault()
+      #         $(@).val("#{$(@).val().substring(0,start)}#{tab}#{$(@).val().substring(end)}")
+      #         $(@).get(0).selectionStart = $(@).get(0).selectionEnd = start + tabchars
+      #       else if keycode == 8
+      #         return unless currentMode=="HAML" and $(@).val().substring(start-tabchars,start) == tab
+      #         e.preventDefault()
+      #         $(@).val("#{$(@).val().substring(0,start-tabchars)}#{$(@).val().substring(end)}")
+      #         $(@).get(0).selectionStart = $(@).get(0).selectionEnd = start-tabchars
+      #       else if keycode == 46
+      #         return unless currentMode=="HAML" and $(@).val().substring(start,start+tabchars) == tab
+      #         e.preventDefault()
+      #         $(@).val("#{$(@).val().substring(0,start)}#{$(@).val().substring(end+tabchars)}")
+      #         $(@).get(0).selectionStart = $(@).get(0).selectionEnd = start
+      #   replaceIt = (html)=>
+      #     if !previous_textarea.is("*") then block.replaceWith(textarea)
+      #     else previous_textarea.replaceWith(textarea)
+      #     textarea.autosize().focus()
+      #   if previousMode != "HAML" then replaceIt(content)
+      #   else $.post "/convert_haml_to_html", {haml: content}, (data)=> replaceIt(data)
+      # convertFromTextarea = (block)->
+      #   textarea = $("textarea[data-pbid=#{block.attr("data-pbid")}]")
+      #   replaceIt = (html)=>
+      #     console.log "Replacing with html: #{html}"
+      #     textarea.replaceWith(block)
+      #     block.html(html)
+      #   if previousMode != "HAML" then replaceIt(textarea.text())
+      #   else $.post "/convert_haml_to_html", {haml: textarea.val()}, (data)=> replaceIt(data)
+      #
+      # $('#pb_bar_format_buttons button').click (e)->
+      #   e.preventDefault()
+      #   return if $(@).hasClass("active")
+      #   previousMode = currentMode
+      #   currentMode = $(@).html()
+      #   changeModes = (block)=>
+      #     textarea = $("textarea[data-pbid=#{block.attr("data-pbid")}]")
+      #     content = if textarea.is("*") then textarea.val() else block.html()
+      #     switch currentMode
+      #       when "WYSIWYG" then convertFromTextarea block
+      #       when "HTML" then convertToTextarea block, html_beautify(content)
+      #       when "HAML" then $.post "/convert_html_to_haml", {html: content}, (data)=> convertToTextarea(block,data,"  ")
+      #       when "Markdown" then convertToTextarea block, html_beautify(content)
+      #   blocks = fetch_blocks() if previousMode == "WYSIWYG"
+      #   blocks.each -> changeModes $(@)
+      #   $(@).siblings().removeClass("active").end().addClass("active")
 
       # Button handlers
       $('#pb_bar_revert').click (e)->

data/app/controllers/polyblock/polyblocks_controller.rb

@@ -5,18 +5,20 @@ module Polyblock
 
     def update
       if params.key?(:pbs)
-        puts params.inspect
         params[:pbs].each do |i, attrs|
-          next if attrs[:content].nil?
+          next if attrs[:content].nil? ||
+                  attrs[:content] == Polyblock::Block::DEFAULTS[:default_text]
           permitted_attrs = attrs.permit(:id, :name, :content, :_destroy)
           id = permitted_attrs.delete :id
-          puts permitted_attrs.inspect
           name = permitted_attrs[:name]
-          matching_block = if id.present?
-                             Block.find_by :id => id.to_i
-                           elsif name.present?
-                             Block.find_by :name => name
-                           end
+          matching_block = nil
+          if id.present?
+            matching_block = Block.find_by :id => id.to_i, :name => name
+          end
+          if name.present?
+            matching_block ||= Block.find_by :name => name,
+                                             :contentable => nil
+          end
           if matching_block.present?
             matching_block.update_attributes!(permitted_attrs) 
           else
@@ -34,29 +36,29 @@ module Polyblock
       end
     end
 
-    def convert_haml_to_html
-      haml = params[:haml]
-
-      # Remove the pesky helpers
-      haml = haml.split("= succeed \"")
-      lines = [haml.shift]
-      haml.each do |chunk|
-        arg = chunk.split("\"",2)[0]
-        block = chunk.split("\n")[1..-1].map{|line| line[2..-1]}.join("\n")
-        lines << "#{block}\narg"
-      end
-      haml = lines.join("")
-
-      # Run it through the engine
-      render :text => Haml::Engine.new(haml).render
-    end
-
-    def convert_html_to_haml
-      # html = if params.has_key? :cbid then ContentBlock.find(params[:cbid]).content else params[:html] end
-      # engine = Html2haml::HTML.new html, :erb => false, :xhtml => false
-      engine = Html2haml::HTML.new params[:html], :erb => false, :xhtml => false
-      render :text => engine.render
-    end
+    # def convert_haml_to_html
+    #   haml = params[:haml]
+    #
+    #   # Remove the pesky helpers
+    #   haml = haml.split("= succeed \"")
+    #   lines = [haml.shift]
+    #   haml.each do |chunk|
+    #     arg = chunk.split("\"",2)[0]
+    #     block = chunk.split("\n")[1..-1].map{|line| line[2..-1]}.join("\n")
+    #     lines << "#{block}\narg"
+    #   end
+    #   haml = lines.join("")
+    #
+    #   # Run it through the engine
+    #   render :text => Haml::Engine.new(haml).render
+    # end
+    #
+    # def convert_html_to_haml
+    #   # html = if params.has_key? :cbid then ContentBlock.find(params[:cbid]).content else params[:html] end
+    #   # engine = Html2haml::HTML.new html, :erb => false, :xhtml => false
+    #   engine = Html2haml::HTML.new params[:html], :erb => false, :xhtml => false
+    #   render :text => engine.render
+    # end
 
   end
 end

data/app/views/polyblock/_editor_bar.html.erb

@@ -1,26 +1,28 @@
 <div class="navbar navbar-inverse navbar-fixed-bottom" id="pb_bar" role="navigation" style="display:none;">
-  <div class="navbar-header">
-    <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".pbbar-collapse">
-      <span class="sr-only">Enable Polyblock Editor</span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-    </button>
-  </div>
-  <div class="collapse navbar-collapse pbbar-collapse">
-    <span class="navbar-brand" style="margin:6px 0px;">
-      <span class="glyphicon glyphicon-pencil pb-change-indicator" style="margin-right:6px;"></span>
-      <span class="pb-change-text">Polyblock Editor</span>
-    </span>
-    <div class="btn-group" id="pb_bar_format_buttons" style="padding-top:8px;">
-      <button class="btn btn-default btn-navbar active" type="button">WYSIWYG</button>
-      <button class="btn btn-default btn-navbar" type="button">HTML</button>
-      <button class="btn btn-default btn-navbar" type="button">HAML</button>
-      <button class="btn btn-default btn-navbar" type="button">Markdown</button>
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".pbbar-collapse">
+        <span class="sr-only">Enable Polyblock Editor</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
     </div>
-    <div class="pull-right">
-      <button class="btn btn-danger navbar-btn" id="pb_bar_revert" type="button">Revert</button>
-      <button class="btn btn-success navbar-btn" id="pb_bar_save" style="margin-left:6px;" type="button">Save Changes</button>
+    <div class="collapse navbar-collapse pbbar-collapse">
+      <span class="navbar-brand">
+        <span class="glyphicon glyphicon-pencil pb-change-indicator" style="margin-right:6px;"></span>
+        <span class="pb-change-text">Polyblock Editor</span>
+      </span>
+      <!-- <div class="btn&#45;group" id="pb_bar_format_buttons" style="padding&#45;top:8px;"> -->
+      <!--   <button class="btn btn&#45;default btn&#45;navbar active" type="button">WYSIWYG</button> -->
+      <!--   <button class="btn btn&#45;default btn&#45;navbar" type="button">HTML</button> -->
+      <!--   <button class="btn btn&#45;default btn&#45;navbar" type="button">HAML</button> -->
+      <!--   <button class="btn btn&#45;default btn&#45;navbar" type="button">Markdown</button> -->
+      <!-- </div> -->
+      <div class="pull-right">
+        <button class="btn btn-danger navbar-btn" id="pb_bar_revert" type="button">Revert</button>
+        <button class="btn btn-success navbar-btn" id="pb_bar_save" style="margin-left:6px;" type="button">Save Changes</button>
+      </div>
     </div>
   </div>
 </div>

data/config/routes.rb

@@ -1,7 +1,7 @@
 Polyblock::Engine.routes.draw do
   mount Ckeditor::Engine => '/ckeditor'
-  post "convert_html_to_haml" => "polyblocks#convert_html_to_haml"
-  post "convert_haml_to_html" => "polyblocks#convert_haml_to_html"
-  post "update" => "polyblocks#update"
+  # post "convert_html_to_haml" => "polyblocks#convert_html_to_haml"
+  # post "convert_haml_to_html" => "polyblocks#convert_haml_to_html"
+  post 'update' => 'polyblocks#update'
   resources :polyblocks
 end

data/lib/polyblock/capybara_helpers.rb

@@ -16,10 +16,12 @@ module Polyblock
       page.execute_script <<-SCRIPT
           var element = $('.polyblock[data-pbname="#{name}"]');
           var ckeditor = CKEDITOR.instances[element.attr('id')];
-          ckeditor.fire('focus');
-          ckeditor.setData('#{params[:with]}');
-          ckeditor.focus();
-          ckeditor.updateElement();
+          setTimeout(function(){
+            ckeditor.fire('focus');
+            ckeditor.setData('#{params[:with]}');
+            ckeditor.focus();
+            ckeditor.updateElement();
+          }, 1);
       SCRIPT
     end
   end

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end