scrivito_sdk 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed04b8aea19ab45efc428cfc454d7522ba12a43a
-  data.tar.gz: 51eeb377f82f5a4ae4025d813f5e38f52e8cfdff
+  metadata.gz: 4c030fbcf0bc0a148de95658bca6192dee2581ab
+  data.tar.gz: 39191bc79378d57f092ea53d88169e20ea5eb307
 SHA512:
-  metadata.gz: 0e8aa479303380e045b69c1b039087392f5967e65e8f16908cb6fc0d07d3fcfd2ff928dc520b0bc2ef863f4def6300b1e3105b9083a2f636e0e25b895cc73eed
-  data.tar.gz: 7a6729a70ac30536439b2cd70bbc7ad6e589561ec79f851c72cad9d8cf3236068f38a11516b4057612207cff900a545677662f2aa106538748726ff5b5ce6b79
+  metadata.gz: 9a499b690ae3fad215f5a58772d8e80c3333e04f33db13deca5ea78d45eeb9dacf7988da7da16fbaa07ca8d020a333fa372614286c0b0092df6e8dd11e08eaa5
+  data.tar.gz: bd110df0b0c3bd1b83c1192d8c267e662f10a096433e89a674df38c1c693dd484858ee46df4b7362aa10063057448defc7a52e0d60f1d44829fea2e694a3e2c1

data/lib/assets/javascripts/scrivito_editing.js

@@ -14431,6 +14431,29 @@ var scrivito = {};
       return scrivito.bypass_throttle ? fn : _.throttle(fn, ms);
     },
 
+    // window.atob does not handle encoded UTF8 strings. See http://mzl.la/1p1zI9k.
+    base64_to_utf8: function(base64_string) {
+      return decodeURIComponent(window.escape(atob(base64_string)));
+    },
+
+    // window.btoa does not handle encoded UTF8 strings. See http://mzl.la/1p1zI9k.
+    utf8_to_base64: function(utf8_string) {
+      return btoa(window.unescape(encodeURIComponent(utf8_string)));
+    },
+
+    json_parse_base64: function(base64_string) {
+      var utf8_string = scrivito.base64_to_utf8(base64_string);
+      // The server escapes non-unicode characters (e.g. '<') when encoding JSON.
+      utf8_string = utf8_string.replace(/\\u([\d\w]{4})/gi, function(match, grp) {
+        return String.fromCharCode(parseInt(grp, 16));
+      });
+      return JSON.parse(utf8_string);
+    },
+
+    json_stringify_base64: function(object) {
+      return scrivito.utf8_to_base64(JSON.stringify(object));
+    },
+
     init: function(config) {
       scrivito.config = config;
 
@@ -15821,9 +15844,8 @@ $(function() {
             assert_valid_workspace_id();
 
             if (has_original_content(that.field_type())) {
-              var encoded_content = that.dom_element()
-                  .attr('data-scrivito-private-field-original-content');
-              return JSON.parse(atob(encoded_content));
+              return scrivito.json_parse_base64(
+                  that.dom_element().attr('data-scrivito-private-field-original-content'));
             } else {
               $.error('Fields of type ' + that.field_type() + ' do not support original content');
             }
@@ -15831,9 +15853,8 @@ $(function() {
 
           set_original_content: function(content) {
             if (has_original_content(that.field_type())) {
-              var encoded_content = btoa(JSON.stringify(content));
-              that.dom_element()
-                  .attr('data-scrivito-private-field-original-content', encoded_content);
+              that.dom_element().attr('data-scrivito-private-field-original-content',
+                  scrivito.json_stringify_base64(content));
             }
           }
         });

data/lib/scrivito/configuration.rb

@@ -39,7 +39,7 @@ module Scrivito
       # Default is <code>false</code>.
       #
       # Example Usage:
-      #     Scrivito::Configuation.editing_auth do |env|
+      #     Scrivito::Configuration.editing_auth do |env|
       #       request = Rack::Request.new(env)
       #       # return truey if current visitor is permitted to edit content, falsy otherwise
       #     end

data/lib/scrivito/editing_context.rb

@@ -4,7 +4,7 @@ class EditingContext
   # +options+:
   #   +:selected_workspace_id+: The id of the selected workspace. If empty +published+ workspace is used.
   #   +:display_mode+: Can be +view+, +editing+, +added+ or +deleted+. If empty +view+ is used.
-  #   +:editor+: A block, which is lazy evaluated on first access, to determine the editor (details see {Scrivito::Configuation.editing_auth})
+  #   +:editor+: A block, which is lazy evaluated on first access, to determine the editor (details see {Scrivito::Configuration.editing_auth})
   # @param [Hash] options
   def initialize(options = {})
     @selected_workspace_id = options[:selected_workspace_id]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails