sketchily 1.0.2 → 1.0.3

data/README.md

@@ -8,27 +8,27 @@ Currently supports and provides `svg-edit-2.6`.
 
 Add this line to your application's Gemfile:
 
-    ```rb
-    gem 'sketchily'
-    ```
+```rb
+gem 'sketchily'
+```
 
 And then execute:
 
-    ```sh
-    $ bundle
-    ```
+```sh
+$ bundle
+```
 
 Or install it yourself as:
 
-    ```sh
-    $ gem install sketchily
-    ```
+```sh
+$ gem install sketchily
+```
 
 Also make sure your `application.js` requires jquery (it usually does by default):
 
-    ```js
-    //= require jquery
-    ```sh
+```js
+//= require jquery
+```
 
 **Note:** sketchily will **automatically** add the following files to your asset precompilation list:
 
@@ -73,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
 
@@ -92,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/views/sketchily/_embed.js.erb

@@ -9,11 +9,14 @@
 
 var svgCanvas_<%= id %> = null;
 
+function submitHandler_<%= id %>(e) {
+  svgCanvas_<%= id %>.getSvgString()(handleSvgData_<%= id %>);
+  e.preventDefault();
+  e.stopImmediatePropagation();
+}
+
 function attachSubmitHandler_<%= id %>() {
-  $("input#<%= id %>").closest("form").one("submit", function(event) {
-    svgCanvas_<%= id %>.getSvgString()(handleSvgData_<%= id %>);
-    return false;
-  });
+  $("input#<%= id %>").closest("form").on("submit", submitHandler_<%= id %>);
 }
 
 function handleSvgData_<%= id %>(data, error) {
@@ -22,8 +25,9 @@ function handleSvgData_<%= id %>(data, error) {
   }
   else {
     $("input#<%= id %>").attr("value", svgedit.utilities.encode64("<?xml version=\"1.0\"?>\n" + data));
+    $("input#<%= id %>").closest("form").off("submit", submitHandler_<%= id %>);
+    $("input#<%= id %>").closest("form").one("submit", attachSubmitHandler_<%= id %>);
     $("input#<%= id %>").closest("form").submit();
-    attachSubmitHandler_<%= id %>();
   }
 }
 
@@ -53,10 +57,10 @@ function initEmbed_<%= id %>() {
     var hyperlinkTool = doc.getElementById('tool_make_link');
     hyperlinkTool.parentNode.removeChild(hyperlinkTool);
   <% end %>
-  
-  attachSubmitHandler_<%= id %>();
 
   svgCanvas_<%= id %>.setSvgString(svgedit.utilities.decode64("<%= value.try(:squish) %>"));
+
+  attachSubmitHandler_<%= id %>();
 }
 
 $("#svgedit_<%= id %>").load(initEmbed_<%= id %>);

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

@@ -9,11 +9,14 @@
 
 var svgCanvas_<%= id %> = null;
 
+function submitHandler_<%= id %>(e) {
+  svgCanvas_<%= id %>.getSvgString()(handleSvgData_<%= id %>);
+  e.preventDefault();
+  e.stopImmediatePropagation();
+}
+
 function attachSubmitHandler_<%= id %>() {
-  $("input#<%= id %>").closest("form").one("submit", function(event) {
-    svgCanvas_<%= id %>.getSvgString()(handleSvgData_<%= id %>);
-    return false;
-  });
+  $("input#<%= id %>").closest("form").on("submit", submitHandler_<%= id %>);
 }
 
 function handleSvgData_<%= id %>(data, error) {
@@ -22,8 +25,10 @@ function handleSvgData_<%= id %>(data, error) {
   }
   else {
     $("input#<%= id %>").attr("value", svgedit.utilities.encode64("<?xml version=\"1.0\"?>\n" + data));
+    $("input#<%= id %>").closest("form").off("submit", submitHandler_<%= id %>);
+    waitingForCallback_<%= id %> = false;
+    $("input#<%= id %>").closest("form").one("submit", attachSubmitHandler_<%= id %>);
     $("input#<%= id %>").closest("form").submit();
-    attachSubmitHandler_<%= id %>();
   }
 }
 
@@ -53,10 +58,10 @@ function initEmbed_<%= id %>() {
     var hyperlinkTool = doc.getElementById('tool_make_link');
     hyperlinkTool.parentNode.removeChild(hyperlinkTool);
   <% end %>
-  
-  attachSubmitHandler_<%= id %>();
 
   svgCanvas_<%= id %>.setSvgString(svgedit.utilities.decode64("<%= value.try(:squish) %>"));
+
+  attachSubmitHandler_<%= id %>();
 }
 
-$().load(initEmbed_<%= id %>);
+$("#svgedit_<%= id %>").load(initEmbed_<%= id %>);

data/lib/sketchily/version.rb

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

data/lib/sketchily/version.rb~

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sketchily
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails