infopark_fiona7 1.2.0.2.3 → 1.5.2.0.0

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

@@ -0,0 +1,53 @@
+'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/models/obj.js

@@ -1,14 +1,8 @@
 (function() {
+  var write_promises = {};
+
   _.extend(scrivito, {
     obj: {
-      serialize_value: function(value) {
-        if (_.isDate(value)) {
-          return serialize_date(value);
-        } else {
-          return value;
-        }
-      },
-
       create_instance: function(params) {
         var that = {
           id: function() {
@@ -19,6 +13,10 @@
             return params.obj_class;
           },
 
+          model_class: function() {
+            return scrivito.ObjClass.find(params.obj_class);
+          },
+
           description_for_editor: function() {
             return params.description_for_editor;
           },
@@ -73,57 +71,52 @@
             return params.last_changed;
           },
 
-          provided_path: function() {
-            return params.path;
-          },
-
           parent_path: function() {
             return params.parent_path;
           },
 
+          // -- PATCH BEINGS HERE --
+          provided_path: function() {
+            return params.path;
+          },
+          // -- PATCH ENDS HERE --
+
           save: function(attrs) {
-            return prepare_attrs(that.id(), attrs).then(function(prepared_attrs) {
-              return persist_obj_data(prepared_attrs, that.id());
-            });
+            return scrivito.ObjSerializer.serialize(that.id(), attrs)
+              .then(function(serialized_attrs) {
+                return that.enqueue_ajax('PUT', 'objs/'+that.id(), {data: {obj: serialized_attrs}});
+              });
           },
 
           destroy: function() {
-            return scrivito.ajax('DELETE', 'objs/' + that.id()).then(function(result) {
+            return that.enqueue_ajax('DELETE', 'objs/'+that.id()).then(function(result) {
               return result.redirect_to;
             });
           },
 
-          destroy_widget: function(widget_id) {
-            return scrivito.ajax('PUT',
-                'objs/' + that.id() + '/destroy_widget?widget_id=' + widget_id);
-          },
-
           revert: function() {
-            return scrivito.ajax('PUT', 'objs/' + that.id() + '/revert');
+            return that.enqueue_ajax('PUT', 'objs/'+that.id()+'/revert');
           },
 
           revert_widget: function(widget_id) {
-            return scrivito.ajax('PUT', 'objs/'+that.id()+'/revert_widget?widget_id='+widget_id);
+            return that.enqueue_ajax('PUT',
+              'objs/'+that.id()+'/revert_widget?widget_id='+widget_id);
           },
 
           conflicting_workspaces: function() {
-            return scrivito.ajax('GET', 'objs/' + that.id() + '/conflicting_workspaces').then(
-                function(workspace_datas) {
-              return scrivito.workspace.from_data_collection(workspace_datas);
-            });
-          },
-
-          is_outdated: function() {
-            return scrivito.ajax('GET', 'objs/' + that.id() + '/is_outdated').then(
-                function(result) { return result.is_outdated; });
+            return that.enqueue_ajax('GET', 'objs/'+that.id()+'/conflicting_workspaces')
+              .then(function(workspace_datas) {
+                return scrivito.workspace.from_data_collection(workspace_datas);
+              });
           },
 
           restore: function() {
-            return scrivito.ajax('PUT', 'objs/' + that.id() + '/restore');
+            return that.enqueue_ajax('PUT', 'objs/'+that.id()+'/restore');
           },
 
           restore_widget: function(widget_id) {
-            return scrivito.ajax('PUT', 'objs/'+that.id()+'/restore_widget?widget_id='+widget_id);
+            return that.enqueue_ajax('PUT',
+              'objs/'+that.id()+'/restore_widget?widget_id='+widget_id);
           },
 
           details_src: function() {
@@ -131,37 +124,37 @@
             return '/__scrivito/page_details/' +  that.id();
           },
 
-          mark_resolved: function() {
-            return scrivito.ajax('PUT', 'objs/' + that.id() + '/mark_resolved');
-          },
-
-          copy_to: function(path) {
-            var attrs = {data: {parent_path: path}};
-            return scrivito.ajax('POST', 'objs/'+that.id()+'/copy', attrs).then(function(data) {
-              return scrivito.obj.create_instance(data);
-            });
-          },
-
-          duplicate: function() {
-            return scrivito.ajax('POST', 'objs/'+that.id()+'/duplicate').then(function(data) {
-              return scrivito.obj.create_instance(data);
-            });
-          },
-
           transfer_modifications_to: function(workspace_id) {
-            return scrivito.ajax('PUT', 'objs/'+that.id()+'/transfer_modifications',
+            return that.enqueue_ajax('PUT', 'objs/'+that.id()+'/transfer_modifications',
               {data: {workspace_id: workspace_id}});
           },
 
           reload: function() {
-            return scrivito.ajax('GET', 'objs/'+that.id()).then(function(data) {
+            return that.enqueue_ajax('GET', 'objs/'+that.id()).then(function(data) {
               params.has_conflict = data.has_conflict;
               params.modification = data.modification;
             });
           },
 
           reload_widget: function(widget_id) {
-            return scrivito.ajax('GET', 'objs/'+that.id()+'/widget?widget_id='+widget_id);
+            return that.enqueue_ajax('GET', 'objs/'+that.id()+'/widget?widget_id='+widget_id);
+          },
+
+          enqueue_ajax: function() {
+            var args = arguments;
+            var ajax = function() { return scrivito.ajax.apply(null, args); };
+
+            if (args[0] === 'GET') { return ajax(); }
+
+            var promise = $.Deferred();
+            (write_promises[that.id()] || $.Deferred().resolve()).always(function() {
+              ajax().then(
+                function() { promise.resolve.apply(promise, arguments); },
+                function() { promise.reject.apply(promise, arguments); }
+              );
+            });
+            write_promises[that.id()] = promise;
+            return promise;
           }
         };
 
@@ -187,7 +180,8 @@
         return scrivito.ajax('GET', path).then(function(selection) {
           var names = _.pluck(selection, 'name');
           var recent = scrivito.obj_class_selection.recent(names);
-          var popular = _.intersection(scrivito.popular_obj_classes, names);
+          var all_popular_valid_obj_classes = _.intersection(scrivito.popular_obj_classes, names);
+          var popular = _.take(all_popular_valid_obj_classes, 5);
           return {
             all: _.sortBy(selection, 'name'),
             recent: _.map(recent, function(name) { return _.findWhere(selection, {name: name}); }),
@@ -197,21 +191,30 @@
       },
 
       fetch_page_class_selection: function(params) {
-        if (!params || params === {}) {
-          var current_page = scrivito.application_document().page();
-          var path = (typeof current_page.provided_path === 'function') && current_page.provided_path();
-          params = {};
-          params['parent_path'] = path;
-        }
         return scrivito.obj.fetch_class_selection('objs/page_class_selection', params);
       },
 
       create: function(attrs) {
-        return prepare_attrs(scrivito.random_id(), attrs).then(function(prepared_attrs) {
-          provide_default_path(prepared_attrs, provide_default_name(prepared_attrs));
-          return persist_obj_data(prepared_attrs).then(function (data) {
-            scrivito.obj_class_selection.store(prepared_attrs._obj_class);
-            return scrivito.obj.create_instance(data);
+        attrs._id = scrivito.random_id();
+        return scrivito.ObjSerializer.serialize(attrs._id, attrs).then(function(serialized_attrs) {
+          // -- PATCH BEGINS HERE --
+          if (!serialized_attrs._path) {
+            var page = scrivito.application_document().page();
+            var path = (typeof page.provided_path === 'function') && page.provided_path();
+            var blobName;
+            if (typeof serialized_attrs.blob === 'object') {
+              blobName = serialized_attrs.blob.name || serialized_attrs.blob.filename;
+            }
+            if (path) {
+              var defaultName = blobName || serialized_attrs._obj_class || serialized_attrs._id;
+              serialized_attrs._path = path + "/" + defaultName;
+            }
+          }
+          // -- PATCH ENDS HERE --
+          var params = {data: {obj: serialized_attrs}};
+          return scrivito.ajax('POST', 'objs', params).then(function(obj_data) {
+            scrivito.obj_class_selection.store(serialized_attrs._obj_class);
+            return scrivito.obj.create_instance(obj_data);
           });
         });
       },
@@ -222,180 +225,12 @@
             if (result.status !== 'success') { return {obj: obj, reason: result.reason}; }
           });
         })).then(function() { return $.Deferred().resolve(_.compact(arguments)); });
-      }
-    }
-  });
-
-  var provide_default_name = function (attrs) {
-    var default_name = null;
-
-    $.each(attrs, function (key, value) {
-      if (value && value.is_uploaded_binary && value.filename) {
-        default_name = value.filename;
-      } else if (is_file(value)) {
-        default_name = value.name;
-      }
-    });
-
-    if (default_name === null) {
-      default_name = attrs._obj_class;
-    } else {
-      // this removes file extension if present
-      default_name = default_name.replace(/\.[^\.]+$/, '');
-    }
-
-    return default_name;
-  };
-
-  var provide_default_path = function (attrs, default_name) {
-    if (!(attrs._path)) {
-      var current_page = scrivito.application_document().page();
-      var path = (typeof current_page.provided_path === 'function') && current_page.provided_path();
-
-      if (path && path !== "/") {
-        attrs._path =  path + "/" + default_name;
-      }
-    }
-  };
+      },
 
-  var obj_url = function (obj_id) {
-    var url = window.location.protocol + '//' + window.location.host + '/__scrivito/objs';
-    if (typeof obj_id !== 'undefined') {
-      url = url + "/" + obj_id;
-    }
-    return url;
-  };
-
-  var persist_obj_data = function (attributes, obj_id) {
-    var has_binary=false;
-    var fd, defer, url, type;
-
-    $.each(attributes, function (key, value) {
-      if (value && value.is_uploaded_binary) {
-        has_binary=true;
-      } else if (is_file(value)) {
-        has_binary=true
-      }
-    });
-
-    // use standard handling for cases without binary upload
-    if (!has_binary) {
-      if (typeof obj_id !== 'undefined') {
-        return scrivito.ajax('PUT', 'objs/'+obj_id, {data: {obj: attributes}});
-      } else {
-        return scrivito.ajax('POST', 'objs', {data: {obj: attributes}});
+      // For test purpose only.
+      clear_write_promises: function() {
+        write_promises = {};
       }
     }
-
-    // use special handling for uploads
-    fd = new FormData();
-    url = obj_url(obj_id);
-    type = (typeof obj_id !== 'undefined') ? 'PUT' : 'POST';
-
-    $.each(attributes, function (key, value) {
-      if ((typeof value === 'object') && (key == '_widget_pool')) {
-        $.each(value, function (subkey, subval) {
-          if (typeof value !== 'undefined') {
-            fd.append('obj[' + key + ']' + '[' + subkey + ']', subval);
-          }
-        });
-      } else if (value && value.is_uploaded_binary && value.filename) {
-        fd.append('obj[' + key + ']', value.blob || value.file, value.filename);
-      } else if (typeof value !== 'undefined') {
-        fd.append('obj[' + key + ']', value);
-      }
-    });
-
-    defer = $.Deferred();
-
-    $.ajax({
-      url: url,
-      type: type,
-      data: fd,
-      processData: false,
-      contentType: false
-    })
-    .error(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;
-      }
-      scrivito.display_ajax_error(error_message);
-      defer.reject(error_message);
-    })
-    .success(function (new_data) {
-      defer.resolve((new_data));
-    });
-
-    return defer.promise();
-  };
-
-  var is_file = function(object) {
-    return object &&
-      _.isFunction(object.slice) &&
-      _.isDate(object.lastModifiedDate) &&
-      _.isString(object.name);
-  };
-
-  var format_date_number = function(number) {
-    var string = number.toString();
-    return string.length === 1 ? '0' + string : string;
-  };
-
-  var serialize_date = function(date) {
-    return date.getUTCFullYear().toString() +
-      '-' + format_date_number(date.getUTCMonth() + 1) + // Month numbers are starting at 0.
-      '-' + format_date_number(date.getUTCDate()) +
-      'T' + format_date_number(date.getUTCHours()) +
-      ':' + format_date_number(date.getUTCMinutes()) +
-      ':' + format_date_number(date.getUTCSeconds()) +
-      'Z';
-  };
-
-  var convert_attrs = function(obj_id, attrs) {
-    var collected_promises = _.map(attrs, function(value, field_name) {
-      if (is_file(value)) {
-        return $.Deferred().resolve([field_name, value]);
-      } else if (value && value.is_uploaded_binary) {
-        return $.Deferred().resolve([field_name, value]);
-      }
-      return $.Deferred().resolve([field_name, scrivito.obj.serialize_value(value)]);
-    });
-
-    return $.when.apply(this, collected_promises).then(function() {
-      return _.object(arguments);
-    });
-  };
-
-  var convert_widget_pool = function(obj_id, widget_pool) {
-    if (widget_pool) {
-      var conversion_promises = _.map(widget_pool, function(attrs, widget_id) {
-        return convert_attrs(obj_id, attrs).then(function(converted_attrs) {
-          return [widget_id, converted_attrs];
-        });
-      });
-
-      return $.when.apply(this, conversion_promises).then(function() {
-        return _.object(arguments);
-      });
-    } else {
-      return $.Deferred().resolve(widget_pool);
-    }
-  };
-
-  var prepare_attrs = function(obj_id, attrs) {
-    return convert_widget_pool(obj_id, attrs._widget_pool).then(function(widget_pool) {
-      return convert_attrs(obj_id, attrs).then(function(converted_attrs) {
-        converted_attrs._widget_pool = widget_pool;
-        return converted_attrs;
-      });
-    });
-  };
+  });
 }());