sketchily 1.0.1 → 1.0.2

data/README.md

@@ -8,15 +8,27 @@ Currently supports and provides `svg-edit-2.6`.
 
 Add this line to your application's Gemfile:
 
+    ```rb
     gem 'sketchily'
+    ```
 
 And then execute:
 
+    ```sh
     $ bundle
+    ```
 
 Or install it yourself as:
 
+    ```sh
     $ gem install sketchily
+    ```
+
+Also make sure your `application.js` requires jquery (it usually does by default):
+
+    ```js
+    //= require jquery
+    ```sh
 
 **Note:** sketchily will **automatically** add the following files to your asset precompilation list:
 
@@ -61,10 +73,10 @@ The following examples assume that the database table for `@my_object` has a `sk
 
 Example usage (haml):
 
-```haml
-= form_for @my_object do |f|
-  = f.sketchily :sketch, :hide_menu => true
-```
+    ```haml
+    = form_for @my_object do |f|
+      = f.sketchily :sketch, :hide_menu => true
+    ```
 
 ### `sketchily_show` helper
 
@@ -80,9 +92,9 @@ Passing only one of those options should keep the aspect ratio of the SVG consta
 
 Example usage (haml):
 
-```haml
-= sketchily_show @my_object.sketch, :width => "500"
-```
+    ```haml
+    = sketchily_show @my_object.sketch, :width => "500"
+    ```
 
 ## Browser Support
 

data/app/assets/javascripts/sketchily_embed.js

@@ -1,4 +1,2 @@
-//= require jquery
-//= require jquery_ujs
 //= require embedapi
 //= require svgutils

data/app/assets/javascripts/sketchily_embed.js~

@@ -1,3 +1,4 @@
 //= require jquery
+//= require jquery_ujs
 //= require embedapi
 //= require svgutils

data/app/views/sketchily/_embed.html.erb

@@ -15,6 +15,9 @@
 
 <%= javascript_include_tag "sketchily_embed" %>
 
+<iframe src="/assets/svg-editor.html?source=&dimensions=<%= "#{canvas_width},#{canvas_height}" %>&canvas_expansion=<%= canvas_expansion %>&showRulers=<%= !hide_rulers %>"
+  width="<%= width %>" height="<%= height %>" id="svgedit_<%= id %>"></iframe>
+
 <script type="text/javascript">
   <%= render :partial => "sketchily/embed",
              :formats => :js,
@@ -24,6 +27,3 @@
                          :hide_image_tool => hide_image_tool,
                          :hide_hyperlink_tool => hide_hyperlink_tool} %>
 </script>
-
-<iframe src="/assets/svg-editor.html?source=&dimensions=<%= "#{canvas_width},#{canvas_height}" %>&canvas_expansion=<%= canvas_expansion %>&showRulers=<%= !hide_rulers %>"
-  width="<%= width %>" height="<%= height %>" id="svgedit_<%= id %>" onload="initEmbed_<%= id %>();"></iframe>

data/app/views/sketchily/_embed.html.erb~

@@ -14,7 +14,6 @@
    hide_hyperlink_tool ||= false %>
 
 <%= javascript_include_tag "sketchily_embed" %>
-<%= javascript_include_tag "svgutils" %>
 
 <script type="text/javascript">
   <%= render :partial => "sketchily/embed",
@@ -27,4 +26,4 @@
 </script>
 
 <iframe src="/assets/svg-editor.html?source=&dimensions=<%= "#{canvas_width},#{canvas_height}" %>&canvas_expansion=<%= canvas_expansion %>&showRulers=<%= !hide_rulers %>"
-  width="<%= width %>" height="<%= height %>" id="svgedit_<%= id %>" onload="initEmbed_<%= id %>();"></iframe>
+  width="<%= width %>" height="<%= height %>" id="svgedit_<%= id %>"></iframe>

data/app/views/sketchily/_embed.js.erb

@@ -58,3 +58,5 @@ function initEmbed_<%= id %>() {
 
   svgCanvas_<%= id %>.setSvgString(svgedit.utilities.decode64("<%= value.try(:squish) %>"));
 }
+
+$("#svgedit_<%= id %>").load(initEmbed_<%= id %>);

data/app/views/sketchily/_embed.js.erb~

@@ -22,15 +22,11 @@ function handleSvgData_<%= id %>(data, error) {
   }
   else {
     $("input#<%= id %>").attr("value", svgedit.utilities.encode64("<?xml version=\"1.0\"?>\n" + data));
-    $("input#<%= id %>").closest("form").trigger("submit.rails");
+    $("input#<%= id %>").closest("form").submit();
     attachSubmitHandler_<%= id %>();
   }
 }
 
-function changef(window, elems) {
-  alert('changed');
-});
-
 function initEmbed_<%= id %>() {
   var frame = document.getElementById('svgedit_<%= id %>');
   svgCanvas_<%= id %> = new embedded_svg_edit(frame);
@@ -59,7 +55,8 @@ function initEmbed_<%= id %>() {
   <% end %>
   
   attachSubmitHandler_<%= id %>();
-  svgCanvas_<%= id %>.bind("changed", changef)();
 
   svgCanvas_<%= id %>.setSvgString(svgedit.utilities.decode64("<%= value.try(:squish) %>"));
 }
+
+$().load(initEmbed_<%= id %>);

data/lib/sketchily/version.rb

@@ -1,3 +1,3 @@
 module Sketchily
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/sketchily/version.rb~

@@ -1,3 +1,3 @@
 module Sketchily
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sketchily
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors: