infopark_fiona7 0.71.0.2 → 0.71.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c163e4ae3c26083dadf3475c69352f2780b734e5
-  data.tar.gz: 7ca74e654c1cc5be22228ea3a5390c3cb4f905b0
+  metadata.gz: 4619dc5e8bf5eb3dd97371dff2649fc8f5ec0132
+  data.tar.gz: 5e991611b12dfd0495a3f61b710c49da1f21e9b9
 SHA512:
-  metadata.gz: f8f4e8b445dbf0ec6c49d46982e9510c375824e87be92ca9899cc6f82221083ddc007af5debe1f546ae51bc16415262eb70b6070b9d19e9da655758bc2886abd
-  data.tar.gz: 725e89fc43efd18b17a71fa5ee5049fe6fa6805ed0fc29369424489d33659425b1c830201ac26e045126668b2a57a2c9b218718ce39ab82384e172c82addaeb8
+  metadata.gz: c9a406c89e791f21722a8401317692b8a786d41d76cdc1790dc615842405349d60f21c455b18e8c2d0e34f4dd1cd6c91cd8ae3482c9757fc8d3b55fbdaaaed45
+  data.tar.gz: a3c4c6a56e68cb1b0c12fb0c98b74f8a498371c679c5e1a8897cc4160b105afe49321bf29c7bc83298bc4236714806df85314ba88374cb2532158a9157d33b0e

data/app/assets/javascripts/fiona7_ui.js

@@ -1,3 +1,4 @@
+//= require scrivito_patches/models/ajax
 //= require scrivito_patches/models/blob
 //= require scrivito_patches/models/obj
 //= require_self

data/app/assets/javascripts/scrivito_patches/models/ajax.js

@@ -0,0 +1,110 @@
+(function() {
+  var handle_task = function(task) {
+    switch (task.status) {
+      case 'success':
+        return $.Deferred().resolve(task.result);
+      case 'error':
+        return $.Deferred().reject({
+          message: task.message,
+          code: task.code
+        });
+      case 'open':
+        return scrivito.wait(2).then(function() {
+          return single_ajax('GET', 'tasks/' + task.id).then(function(data) {
+            return handle_task(data);
+          });
+        });
+      default:
+        throw { message: "Invalid task (unknown status)", task: task };
+    }
+  };
+
+  var single_ajax = function(type, path, options) {
+    var base_url = window.location.protocol + '//' + window.location.host + '/__scrivito/';
+    if (options && options.data) {
+      options.data = JSON.stringify(options.data);
+    }
+    return $.ajax(base_url + path, _.extend({
+      type: type,
+      dataType: 'json',
+      contentType: 'application/json; charset=utf-8',
+      cache: false // Don't cache GET requests.
+    }, options || {})).then(
+      function(result, text_status, xhr) {
+        return $.Deferred().resolve(result);
+      }, function(xhr, text_status, error) {
+        var error_message;
+        var error_code;
+        try {
+          var error_json = JSON.parse(xhr.responseText);
+          error_message = error_json.error;
+          error_code = error_json.code;
+        } catch (SyntaxError) {}
+
+        if (!error_message) {
+          error_message = error;
+        }
+        return $.Deferred().reject({
+          status: xhr.status,
+          message: error_message,
+          code: error_code
+        });
+      }
+    );
+  };
+
+  _.extend(scrivito, {
+    silent_ajax: function(type, path, options) {
+      var is_write_request = type === 'PUT' || type === 'POST' || type === 'DELETE';
+      if (is_write_request) {
+        options = options || {};
+        // HIGHER TIMEOUT HERE!
+        options.timeout = 45000; // miliseconds
+        scrivito.write_monitor.start_write();
+      }
+
+      var ajax_promise = single_ajax(type, path, options).then(function(result) {
+        if (result && result.task && _.size(result) === 1) {
+          return handle_task(result.task);
+        } else {
+          return $.Deferred().resolve(result);
+        }
+      });
+
+      if (is_write_request) {
+        ajax_promise.always(function() {
+          scrivito.write_monitor.end_write();
+        });
+      }
+
+      return ajax_promise;
+    },
+
+    ajax: function(type, path, options) {
+      return scrivito.silent_ajax(type, path, options).fail(function(error) {
+        scrivito.display_ajax_error(error);
+      });
+    },
+
+    display_ajax_error: function(error) {
+      var ajax_error = error.message;
+      var error_message;
+      if (_.contains(['abort', 'parsererror', 'timeout'], ajax_error)) {
+        error_message = scrivito.t('ajax.error.communication');
+      } else if (ajax_error === 'error') {
+        error_message = scrivito.t('ajax.error.unknown');
+      } else if (ajax_error) {
+        error_message = scrivito.t('ajax.error', ajax_error);
+      } else {
+        error_message = scrivito.t('ajax.error.unknown');
+      }
+
+      if (scrivito.is_development_mode) {
+        scrivito.alert_dialog(error_message);
+      } else {
+        scrivito.log_error(error_message);
+        scrivito.info_dialog(scrivito.t('ajax.error.production'));
+      }
+    }
+  });
+}());

data/lib/fiona7/link_converter/scrivito_to_fiona.rb

@@ -12,7 +12,12 @@ module Fiona7
       private
       def serialize_html
         # TODO: this an incomplete list of possible tags
-        link_expressions = [/(href)\s*=\s*"([^"]*)"/, /(href)\s*=\s*'([^']*)'/]
+        if Fiona7.mode == :legacy
+          link_expressions = [/(src|href)\s*=\s*"([^"]*)"/, /(src|href)\s*=\s*'([^']*)'/]
+        else
+          # in standalone mode image links cannot be stored correctly
+          link_expressions = [/(href)\s*=\s*"([^"]*)"/, /(href)\s*=\s*'([^']*)'/]
+        end
         link_expressions.each do |expr|
           @value.gsub!(expr) do |string|
             target = $2

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "0.71.0.2"
+  VERSION = "0.71.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 0.71.0.2
+  version: 0.71.0.3
 platform: ruby
 authors:
 - Tomasz Przedmojski
@@ -135,6 +135,7 @@ files:
 - app/assets/images/fiona7-marker.png
 - app/assets/javascripts/fiona7.js
 - app/assets/javascripts/fiona7_ui.js
+- app/assets/javascripts/scrivito_patches/models/ajax.js
 - app/assets/javascripts/scrivito_patches/models/blob.js
 - app/assets/javascripts/scrivito_patches/models/obj.js
 - app/assets/stylesheets/fiona7-login.css.scss