From 1602f9b9c0f279d6e935beb5a77ba336c251fdca Mon Sep 17 00:00:00 2001 From: did Date: Sat, 5 Mar 2011 23:56:40 +0100 Subject: [PATCH] the inline editor was broken (caused by the last version of mongoid), now it does work --- doc/TODO | 8 +------ .../admin/inline_editor_toolbar.js | 22 +++++++++---------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/doc/TODO b/doc/TODO index 4f4e0b93..4485717a 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,12 +1,6 @@ BOARD: -x pull requests #31 et #32 -x password / new_password -- bugs - x custom_fields not deleted (doesn't use index anymore) - ? editable_elements slug becomes nil - - editable_elements not updated (doesn't use index anymore) - x uploading videos http://groups.google.com/group/carrierwave/browse_thread/thread/6e211d98f1ff4bc0/51717c2167695ca2?lnk=gst&q=version#51717c2167695ca2 +- integrate new home - editable_elements: inheritable: false (Mattias) - duostack version - 2 different sites on the same main domain (one in www, the other one in something else) (Raphael Costa) diff --git a/public/javascripts/admin/inline_editor_toolbar.js b/public/javascripts/admin/inline_editor_toolbar.js index 45c03470..4eb90f74 100644 --- a/public/javascripts/admin/inline_editor_toolbar.js +++ b/public/javascripts/admin/inline_editor_toolbar.js @@ -54,14 +54,15 @@ var InlineEditorToolbar = { updateForm: function(jEvent, aEvent) { InlineEditorToolbar.element.find('li.save, li.cancel, li.sep:eq(1)').show(); - InlineEditorToolbar.element.find('') + var content = aEvent.editable.getContents().replace(/^\s*/, "").replace(/\s*$/, ""); var editableObj = $(aEvent.editable.obj[0]); - var index = editableObj.attr('data-element-index'); - var input = InlineEditorToolbar.form.find('#editable-' + index); + var dataId = editableObj.attr('data-element-id'); + var idInput = InlineEditorToolbar.form.find('#editable-id'); + var contentInput = InlineEditorToolbar.form.find('#editable-content'); - input.attr('name', input.attr('name').replace('_index', 'content')); - input.val(aEvent.editable.getContents().replace(/^\s*/, "").replace(/\s*$/, "")); + idInput.attr('name', 'page[editable_elements_attributes][0][id]').val(dataId); + contentInput.attr('name', 'page[editable_elements_attributes][0][content]').val(content); InlineEditorToolbar.show(true, false); }, @@ -89,10 +90,9 @@ var InlineEditorToolbar = { var editPageUrl = $('meta[name=edit-page-url]').attr('content'); var nbElements = parseInt($('meta[name=page-elements-count]').attr('content')); - var formContentHTML = ""; - for (var i = 0; i < nbElements; i++) { - formContentHTML += ""; - } + var formContentHTML = "\ + \ + "; $('body').prepend("
\