polyblock 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edd641d3a2ddf600f2cd7daf8f1df3a114011d02
-  data.tar.gz: 8dc664c26f64774d7fd5e43d903593f1ad7da709
+  metadata.gz: a144f379db0baf032b3ebfee8bd6d9e1efaa3aed
+  data.tar.gz: afd53bafd7a88b3151c9f14bd8f748e5c703a378
 SHA512:
-  metadata.gz: a100c4b0ae6c3164196dad65321b7db6531cf022631a35e8ab71ca38ac252b7f983517b4af791add2926365776bda1dd5c217255a8c1294e76c6af4aaa608825
-  data.tar.gz: c3d828b9025c876b5e2781ef8ac00cfb9a0ccc083c4696c33ef5d95eeb1e41e3dc7a7541fc1c65787ed57f43138105ca782db5313ab6c5c1189b9481117f1f5d
+  metadata.gz: 4aa9a039fe6a700224a7b956618881a880585bcd61ab7b2744140519972381f2759d848d7461c41cc909fff82a55c7ddd9cf2133f8d31c41987e322bd1231eb5
+  data.tar.gz: 6f55bf7c4cf47a27611d6342d5c00774d4e7a9677d21370f3566b0b3960d75dc6ec3fb889c0f84d532e2442114a60dc2dfb4a4925b207ccfdb9733672cfae407

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

@@ -17,12 +17,18 @@ $ ->
       # Clone each block and instanciate CKeditor on the original
       blockclones = {}
       instanciateCKEditor = (id)->
-        CKEDITOR.inline id,
+        editor = CKEDITOR.inline id,
           on:
-            focus:(e)->
+            contentDom: ->
+              editor.document.on 'keydown', (e)->
+                if (e.data.$.ctrlKey or e.data.$.metaKey) and e.data.$.keyCode == 83
+                  try e.data.$.preventDefault()
+                  saveChanges()
+                  false
+            focus: (e)->
               editorModeOn()
               startListening(id)
-            blur:(e)-> stopListening()
+            blur: (e)-> stopListening()
       blocks.each ->
         id = $(@).attr('id')
         blockclones[id] = $(@).clone()

data/app/controllers/polyblock/polyblocks_controller.rb

@@ -10,6 +10,7 @@ module Polyblock
           pb_attrs[:id] = attrs[:id] if attrs.has_key?(:id) and !attrs[:id].blank?
           pb_attrs[:name] = attrs[:name] if attrs.has_key?(:name) and !attrs[:name].blank?
           pb = Block.find_or_initialize_by pb_attrs
+          pb.id = nil if Block.find(pb_attrs[:id]).present? and pb.new_record?
           pb.content = attrs[:content]
           pb.save!
         end

data/app/helpers/polyblock/application_helper.rb

@@ -3,6 +3,7 @@ module Polyblock
 
     def pb(name, options={})
       options = {
+          :editable => false,
           :tag => :div,
           :tag_options => {},
           :condensed => false,
@@ -20,12 +21,10 @@ module Polyblock
         matches = Polyblock::Block.where :name => name
         pb_exists = matches.any?
         pb = pb_exists ? matches.first : Polyblock::Block.new({:name => name})
-        if pb_exists
-          pb_id = pb.id
+        pb_id = if pb_exists
+          pb.id
         else
-          nextId = Polyblock::Block.count + 1
-          nextId += 1 while Polyblock::Block.where(:id => nextId).any?
-          pb_id = nextId
+          Polyblock::Block.any? ? Polyblock::Block.order(:id).last.id + 1 : 1
         end
       end
 
@@ -38,6 +37,8 @@ module Polyblock
       tag_options = options[:tag_options].deep_merge({:id => "pb-#{pb_id}-#{random_id}", :data => {:pbid => pb_id, :pbname => name}})
       tag_options[:contenteditable] = if options[:condensed]
                                         "false"
+                                      elsif options[:editable]
+                                        "true"
                                       elsif respond_to?(:can?) && can?(:manage, pb)
                                         "true"
                                       elsif respond_to?(:user_signed_in?) && user_signed_in?

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "0.3.7"
+  VERSION = "0.3.9"
 end

data/test/dummy/app/views/home/index.html.haml

@@ -1,7 +1,7 @@
 %h1 Polyblock Test Dummy
 
 %h3 Polyblock with Inline Editing
-= pb("Test")
+= pb "Test", :editable => true
 
 %h3 New Polyblock
 = pb "New"