github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

the inline editor was broken (caused by the last version of mongoid), now it does work

This commit is contained in:
did 2011-03-05 23:56:40 +01:00
parent 35eeac8306
commit 1602f9b9c0
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/TODO
View File

@ -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)

18
public/javascripts/admin/inline_editor_toolbar.js
View File

@ -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 = "<input type='hidden' name='_method' value='put' />";
for (var i = 0; i < nbElements; i++) {
formContentHTML += "<input class='auto' id='editable-" + i + "' type='hidden' name='page[editable_elements_attributes][" + i + "][_index]' value='' />";
}
var formContentHTML = "<input type='hidden' name='_method' value='put' />\
<input class='auto' id='editable-id' type='hidden' name='_id' value='' />\
<input class='auto' id='editable-content' type='hidden' name='_content' value='' />";
$('body').prepend("<div id='page-toolbar'>\
<ul>\