Changes for page InplaceEditing

From 4.1 to 3.1 From 6.1 to 5.1

From version 5.1

edited by Nazzareno Pompei
on 30/01/2023 10:31

Change comment: Install extension [org.xwiki.platform:xwiki-platform-edit-ui/14.10.3]

To version 4.1

edited by Nazzareno Pompei
on 28/10/2022 08:43

Change comment: Install extension [org.xwiki.platform:xwiki-platform-edit-ui/14.9]

Raw
Rendered

Summary

Objects (1 modified, 0 added, 0 removed)
- XWiki.JavaScriptExtension[0]

Details

XWiki.JavaScriptExtension[0]

Code

@@ -223,7 +223,7 @@
    };
    var loadCSS = function(url) {
--    $('<link/>').attr({
++    var link = $('<link>').attr({
        type: 'text/css',
        rel: 'stylesheet',
        href: url
@@ -695,12 +695,6 @@
      });
    };
--  function addToFormData(formData, inputs) {
--    inputs.serializeArray().forEach(function(entry) {
--      formData.append(entry.name, entry.value);
--    });
--  }
--
    // actionButtons.js expects a form so we use a fake form. Refactoring actionButtons.js is too dangerous ATM.
    var fakeForm = {
      action: XWiki.currentDocument.getURL('save'),
@@ -731,33 +731,45 @@
        return this._getActionButtons().find(selector)[0];
      },
      serialize: function() {
--      var formData = new FormData();
--      addToFormData(formData, this._getActionButtons().find(':input'));
++      var extra = this._getActionButtons().find(':input').serializeArray().reduce(function(extra, entry) {
++        var value = extra[entry.name] || [];
++        value.push(entry.value);
++        extra[entry.name] = value;
++        return extra;
++      }, {});
        // retrieve all input fields listing the temporary uploaded files.
++      var uploadedFiles = $('#xwikicontent').nextAll('input[name="uploadedFiles"]').serializeArray().reduce(function(extra, entry) {
++        var value = extra[entry.name] || [];
++        value.push(entry.value);
++        extra[entry.name] = value;
++        return extra;
++      }, {});
        var xwikiDocument = this._getActionButtons().data('xwikiDocument');
--      formData.set('title', xwikiDocument.rawTitle);
--      formData.set('language', xwikiDocument.getRealLocale());
--      formData.set('isNew', xwikiDocument.isNew);
--
--      if (xwikiDocument.content !== xwikiDocument.originalDocument.content) {
++      var formData = {
++        title: xwikiDocument.rawTitle,
++        language: xwikiDocument.getRealLocale(),
++        isNew: xwikiDocument.isNew
++      };
++      if (xwikiDocument.content != xwikiDocument.originalDocument.content) {
          // Submit the raw (source) content. No syntax conversion is needed in this case.
--        formData.set('content', xwikiDocument.content);
++        formData.content = xwikiDocument.content;
        } else {
          // Submit the rendered content (HTML), but make sure it is converted to the document syntax on the server.
--        formData.set('content', xwikiDocument.renderedContent);
--        formData.set('RequiresHTMLConversion', 'content');
--        formData.set('content_syntax', xwikiDocument.syntax);
++        $.extend(formData, {
++          content: xwikiDocument.renderedContent,
++          RequiresHTMLConversion: 'content',
++          content_syntax: xwikiDocument.syntax
++        });
        }
        // Add the temporary uploaded files to the form.
--      addToFormData(formData, $('#xwikicontent').nextAll('input[name="uploadedFiles"]'));
--
++      $.extend(formData, uploadedFiles);
        // Check for merge conflicts only if the document is not new and we know the current version.
        if (!xwikiDocument.isNew && xwikiDocument.version) {
--        formData.set('previousVersion', xwikiDocument.version);
--        formData.set('editingVersionDate', new Date(xwikiDocument.modified).getTime());
++        formData.previousVersion = xwikiDocument.version;
++        formData.editingVersionDate = new Date(xwikiDocument.modified).getTime();
        }
--      // Note: if you refactor, please make sure that actionsButtons inputs have the lowest priority.
--      return formData;
++      // Ensure that formData information has priority over extra information.
++      return $.extend({}, extra, formData);
      }
    };