sketchily 1.2.0 → 1.3.0

data/README.md

@@ -59,6 +59,9 @@ Currently available options are:
 - `width` total width of editor
 - `height` total height of editor
 
+- `bkgd_color` canvas background color (3 or 6 hex digit html color format; not saved with image)
+- `bkgd_url` canvas background raster image url (not saved with image)
+
 - `canvas_width` initial canvas width
 - `canvas_height` initial canvas height
 - `canvas_expansion` 0 if you want to disable scrolling

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

@@ -5,6 +5,8 @@
    # Additionally, they may override the following variables:
    width ||= "750px"
    height ||= "650px"
+   bkgd_color ||= "FFF"
+   bkgd_url ||= ""
    canvas_width ||= 640
    canvas_height ||= 480
    canvas_expansion ||= 3
@@ -19,14 +21,13 @@
 <% iframe_src = URI.parse("/assets/svg-editor.html")
 
    query_hash = {:dimensions => [canvas_width, canvas_height].join(','),
+                 :bkgd_color => bkgd_color,
+                 :bkgd_url => bkgd_url,
                  :canvas_expansion => canvas_expansion,
                  :showRulers => !hide_rulers,
                  :showlayers => show_layers}
-   if url
-     query_hash[:url] = url
-   else
-     query_hash[:source] = nil
-   end
+   query_hash[:url] = url if url
+   query_hash[:source] = nil unless url
 
    iframe_src.query = query_hash.map{|k,v| "#{k}=#{v}"}.join('&') %>
 

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

@@ -5,6 +5,8 @@
    # Additionally, they may override the following variables:
    width ||= "750px"
    height ||= "650px"
+   bkgd_color ||= "FFFFFF"
+   bkgd_url ||= ""
    canvas_width ||= 640
    canvas_height ||= 480
    canvas_expansion ||= 3
@@ -19,14 +21,13 @@
 <% iframe_src = URI.parse("/assets/svg-editor.html")
 
    query_hash = {:dimensions => [canvas_width, canvas_height].join(','),
+                 :bkgd_color => bkgd_color,
+                 :bkgd_url => bkgd_url,
                  :canvas_expansion => canvas_expansion,
                  :showRulers => !hide_rulers,
                  :showlayers => show_layers}
-   if url
-     query_hash[:url] = url
-   else
-     query_hash[:source] = nil
-   end
+   query_hash[:url] = url if url
+   query_hash[:source] = nil unless url
 
    iframe_src.query = query_hash.map{|k,v| "#{k}=#{v}"}.join('&') %>
 
@@ -49,3 +50,4 @@
                          :hide_hyperlink_tool => hide_hyperlink_tool,
                          :url => url} %>
 </script>
+

data/lib/sketchily/version.rb

@@ -1,3 +1,3 @@
 module Sketchily
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/sketchily/version.rb~

@@ -1,3 +1,3 @@
 module Sketchily
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/sketchily.rb

@@ -5,7 +5,7 @@ require "sketchily/sketchily_tag"
 module Sketchily
   ASSET_FILES = %w(sketchily.css sketchily.js sketchily_embed.js canvg/canvg.js canvg/rgbcolor.js extensions/ext-*.js locale/lang.*.js)
 
-  SKETCHILY_OPTIONS = [:width, :height, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :hide_hyperlink_tool, :show_layers, :url]
+  SKETCHILY_OPTIONS = [:width, :height, :bkgd_color, :bkgd_url, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :hide_hyperlink_tool, :show_layers, :url]
   TAG_OPTIONS = [:id, :value, :index]
   OPTIONS = SKETCHILY_OPTIONS + TAG_OPTIONS
 

data/lib/sketchily.rb~

@@ -5,7 +5,7 @@ require "sketchily/sketchily_tag"
 module Sketchily
   ASSET_FILES = %w(sketchily.css sketchily.js sketchily_embed.js canvg/canvg.js canvg/rgbcolor.js extensions/ext-*.js locale/lang.*.js)
 
-  SKETCHILY_OPTIONS = [:width, :height, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :hide_hyperlink_tool, :url, :show_layers]
+  SKETCHILY_OPTIONS = [:width, :height, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :hide_hyperlink_tool, :show_layers, :url]
   TAG_OPTIONS = [:id, :value, :index]
   OPTIONS = SKETCHILY_OPTIONS + TAG_OPTIONS
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sketchily
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -101,6 +101,7 @@ extra_rdoc_files: []
 files:
 - app/assets/stylesheets/sketchily.css~
 - app/assets/stylesheets/sketchily.css
+- app/assets/javascripts/base64.js
 - app/assets/javascripts/sketchily.js
 - app/assets/javascripts/sketchily.js~
 - app/assets/javascripts/sketchily_embed.js
@@ -359,8 +360,6 @@ files:
 - vendor/assets/svg-edit-2.6/jquerybbq/jquery.bbq.min.js
 - vendor/assets/svg-edit-2.6/js-hotkeys/jquery.hotkeys.min.js
 - vendor/assets/svg-edit-2.6/js-hotkeys/README.md
-- vendor/assets/javascripts/base64.js
-- vendor/assets/javascripts/base64.js~
 - MIT-LICENSE
 - Rakefile
 - README.md

data/vendor/assets/javascripts/base64.js~

@@ -1,95 +0,0 @@
-// This code was written by Tyler Akins and has been placed in the
-// public domain.  It would be nice if you left this header intact.
-// Base64 code from Tyler Akins -- http://rumkin.com
-
-// schiller: Removed string concatenation in favour of Array.join() optimization,
-//           also precalculate the size of the array needed.
-
-// Function: sketchily_encode64
-// Converts a string to base64
-var sketchily_encode64 = function(input) {
-  // base64 strings are 4/3 larger than the original string
-  input = sketchily_convertToXMLReferences(input);
-  if(window.btoa) return window.btoa(input); // Use native if available
-  var output = new Array( Math.floor( (input.length + 2) / 3 ) * 4 );
-  var chr1, chr2, chr3;
-  var enc1, enc2, enc3, enc4;
-  var i = 0, p = 0;
-
-  do {
-	  chr1 = input.charCodeAt(i++);
-	  chr2 = input.charCodeAt(i++);
-	  chr3 = input.charCodeAt(i++);
-
-	  enc1 = chr1 >> 2;
-	  enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-	  enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-	  enc4 = chr3 & 63;
-
-	  if (isNaN(chr2)) {
-		  enc3 = enc4 = 64;
-	  } else if (isNaN(chr3)) {
-		  enc4 = 64;
-	  }
-
-	  output[p++] = KEYSTR.charAt(enc1);
-	  output[p++] = KEYSTR.charAt(enc2);
-	  output[p++] = KEYSTR.charAt(enc3);
-	  output[p++] = KEYSTR.charAt(enc4);
-  } while (i < input.length);
-
-  return output.join('');
-};
-
-// Function: sketchily_decode64
-// Converts a string from base64
-var sketchily_decode64 = function(input) {
-  if(window.atob) return window.atob(input);
-  var output = "";
-  var chr1, chr2, chr3 = "";
-  var enc1, enc2, enc3, enc4 = "";
-  var i = 0;
-
-   // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
-   input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-
-   do {
-	  enc1 = KEYSTR.indexOf(input.charAt(i++));
-	  enc2 = KEYSTR.indexOf(input.charAt(i++));
-	  enc3 = KEYSTR.indexOf(input.charAt(i++));
-	  enc4 = KEYSTR.indexOf(input.charAt(i++));
-
-	  chr1 = (enc1 << 2) | (enc2 >> 4);
-	  chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-	  chr3 = ((enc3 & 3) << 6) | enc4;
-
-	  output = output + String.fromCharCode(chr1);
-
-	  if (enc3 != 64) {
-	     output = output + String.fromCharCode(chr2);
-	  }
-	  if (enc4 != 64) {
-	     output = output + String.fromCharCode(chr3);
-	  }
-
-	  chr1 = chr2 = chr3 = "";
-	  enc1 = enc2 = enc3 = enc4 = "";
-
-   } while (i < input.length);
-   return unescape(output);
-};
-
-// Function: sketchily_convertToXMLReferences 
-// Converts a string to use XML references
-sketchily_convertToXMLReferences = function(input) {
-	var output = '';
-	for (var n = 0; n < input.length; n++){
-		var c = input.charCodeAt(n);
-		if (c < 128) {
-			output += input[n];
-		} else if(c > 127) {
-			output += ("&#" + c + ";");
-		}
-	}
-	return output;
-};