infopark_fiona7 1.5.5.5.1 → 1.6.1.1.0

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

@@ -1,53 +0,0 @@
-'use strict';
-
-(function () {
-  // -- PATCH BEGINS HERE --
-  // remove old scrivito.binaryFieldElement
-  var definitions = scrivito.cms_element.definitions;
-  for (var i = 0; i < definitions.length; ++i) {
-    if (definitions[i] === scrivito.binaryFieldElement) {
-      definitions.splice(i, 1);
-      break;
-    }
-  }
-  // -- PATCH ENDS HERE --
-
-  scrivito.binaryFieldElement = {
-    create_instance: function create_instance(cmsElement) {
-      if (cmsElement.dom_element().attr('data-scrivito-field-type') === 'binary') {
-        var that = scrivito.cms_field_element.create_instance(cmsElement);
-        // -- PATCH BEGINS HERE --
-        /*
-        const bufferedWriter = new scrivito.BufferedWriter((value) => {
-          if (scrivito.BinaryUtils.isFile(value)) {
-            return scrivito.Binary.upload(value).into(that.basic_obj());
-          }
-          if (value instanceof scrivito.FutureBinary) {
-            return value.into(that.basic_obj());
-          }
-           return scrivito.Promise.resolve(value);
-        });
-         _.extend(that, {
-          preprocess(value) {
-            return bufferedWriter.write(value).catch((error) => {
-              scrivito.handleAjaxError(error);
-              throw error;
-            });
-          },
-        });
-        */
-
-        _.extend(that, {
-          preprocess: function preprocess(value) {
-            return scrivito.Promise.resolve(value);
-          }
-        });
-        // -- PATCH ENDS HERE --
-
-        return that;
-      }
-    }
-  };
-
-  scrivito.cms_element.definitions.push(scrivito.binaryFieldElement);
-})();

data/app/assets/javascripts/scrivito_patches/obj_serializer.js

@@ -1,91 +0,0 @@
-"use strict";
-
-(function () {
-  scrivito.ObjSerializer = {
-    serialize: function serialize(objId, attrs) {
-      var promise = serializeWidgetPool(objId, attrs._widget_pool).then(function (widgetPool) {
-        return serializeAttrs(objId, attrs).then(function (serializedAttrs) {
-          if (widgetPool) {
-            serializedAttrs._widget_pool = widgetPool;
-          }
-          return serializedAttrs;
-        });
-      });
-
-      return scrivito.promise.wrapInJqueryDeferred(promise);
-    },
-
-    serializeValue: function serializeValue(value) {
-      if (_.isDate(value)) {
-        return moment.utc(value).toISOString();
-      }
-
-      return value;
-    }
-  };
-
-  function serializeWidgetPool(objId, widgetPool) {
-    if (widgetPool) {
-      var promises = _.map(widgetPool, function (attrs, widgetId) {
-        return serializeAttrs(objId, attrs).then(function (serializedAttrs) {
-          return [widgetId, serializedAttrs];
-        });
-      });
-
-      return scrivito.Promise.all(promises).then(function (serializedWidgetPool) {
-        return _.object(serializedWidgetPool);
-      });
-    }
-
-    return scrivito.Promise.resolve(widgetPool);
-  }
-
-  function serializeAttrs(objId, attrs) {
-    var promises = _.map(attrs, function (attrValue, attrName) {
-      return serializeAttr(objId, attrName, attrValue);
-    });
-
-    return scrivito.Promise.all(promises).then(function (serializedAttrs) {
-      return _.object(serializedAttrs);
-    });
-  }
-
-  function serializeAttr(objId, attrName, attrValue) {
-    if (scrivito.BinaryUtils.isFile(attrValue) || scrivito.BinaryUtils.isBlob(attrValue)) {
-      return serializeFile(objId, attrName, attrValue);
-    }
-
-    if (attrValue instanceof scrivito.UploadedBlob) {
-      return serializeUploadedBlob(objId, attrName, attrValue);
-    }
-
-    if (attrValue instanceof scrivito.FutureBinary) {
-      return serializeFutureBinary(objId, attrName, attrValue);
-    }
-
-    return scrivito.Promise.resolve([attrName, scrivito.ObjSerializer.serializeValue(attrValue)]);
-  }
-
-  function serializeFile(objId, attrName, file) {
-    return scrivito.Promise.resolve([attrName, file]); // <-- PATCH HERE
-  }
-
-  function serializeUploadedBlob(objId, attrName, uploadedBlob) {
-    return serializeFutureBinary(objId, attrName, uploadedBlob.copy());
-  }
-
-  function serializeFutureBinary(objId, attrName, futureBinary) {
-    if (futureBinary.idToCopy) {
-      // blob copy/rename
-      var blob = {
-        id_to_copy: futureBinary.idToCopy
-      };
-      if (futureBinary.filename) blob.filename = futureBinary.filename;
-      if (futureBinary.contentType) blob.content_type = futureBinary.contentType;
-      return scrivito.Promise.resolve([attrName, blob]);
-    } else if (futureBinary.source) {
-      // normal upload
-      return scrivito.Promise.resolve([attrName, { blob_to_upload: futureBinary.source, filename: futureBinary.filename }]);
-    }
-  }
-})();

data/lib/fiona7/scrivito_patches/attribute_serializer.rb

@@ -1,37 +0,0 @@
-require 'scrivito/attribute_serializer'
-
-module Scrivito
-  class AttributeSerializer
-    def serialize_binary_value(attribute_value, attribute_definition)
-      case attribute_value
-      when File           then attribute_value
-      when FutureBinary   then special_handling_of_future_binary(attribute_value, attribute_definition)
-      when UploadedBinary then attribute_value.params
-      else
-        raise_validation_error(attribute_definition.name,
-                               'an instance of File, Scrivito::UploadedBinary or nil', attribute_value)
-      end
-    end
-
-    protected
-    def special_handling_of_future_binary(future_binary, attribute_definition)
-      if future_binary.file_to_upload
-        # The easy case: just upload the file directly, it works
-        future_binary.file_to_upload
-      elsif future_binary.id_to_copy
-        # The hard case: magic blob copy/rename needs to happen
-        {
-          obj_id:         obj_id,
-          attr_name:      attribute_definition.name.to_s,
-          id_to_copy:     future_binary.id_to_copy,
-          filename:       future_binary.filename,
-          content_type:   future_binary.content_type
-        }
-      else
-        # The unknown case: ???
-        Rails.logger.error("Unsure how to proceed with an upload of #{future_binary.inspect}")
-        nil
-      end
-    end
-  end
-end

data/lib/fiona7/scrivito_patches/model_library.rb

@@ -1,19 +0,0 @@
-require "scrivito/model_library"
-
-module Scrivito
-  class ModelLibrary
-
-    private
-    # support for ShadowClasses
-    def load_model(class_name, base_class)
-      model_class = class_name.constantize
-      return model_class if model_class.ancestors.include?(base_class)
-
-      if Fiona7.mode == :legacy && model_class.respond_to?(:shadow_class)
-        model_class = model_class.shadow_class rescue nil
-        model_class if model_class && model_class.ancestors.include?(base_class)
-      end
-    rescue LoadError
-    end
-  end
-end

data/lib/fiona7/scrivito_patches/obj_params_parser.rb

@@ -1,20 +0,0 @@
-require "scrivito/obj_params_parser"
-
-
-module Scrivito
-  class ObjParamsParser
-    private
-    def parse_binary_params(params)
-      return unless params
-
-      if params.kind_of?(Hash) && params[:copy]
-        parse_copy_binary_params(params[:copy])
-      else
-        # Uploaded binary may contain anything at this point
-        # an ID (string) or a File or even UploadedFile
-        # but the backed will sort this out
-        UploadedBinary.new(params)
-      end
-    end
-  end
-end