Integrating TinyMce with the Media Library

--HG--
branch : 1.x
extra : rebase_source : 64b75e44522bc583bfb521c8cf9850fa5d596068
This commit is contained in:
Sebastien Ros
2013-06-06 16:54:12 -07:00
parent b4a22ff546
commit b9d3d10bca
14 changed files with 135 additions and 133 deletions

View File

@@ -1,6 +1,16 @@
<Placement>
<Place Parts_Media_Edit="Content:6"/>
<!-- Raw Media -->
<Match DisplayType="Raw">
<Place Parts_Image="Content"
Parts_Video="Content"
Parts_Audio="Content"
Parts_Document="Content"
Parts_OEmbed="Content"
/>
</Match>
<!-- MediaPart -->
<Match DisplayType="SummaryAdmin">
<Place Parts_Media_SummaryAdmin="Meta:5"

View File

@@ -418,7 +418,7 @@
$("#media-library-main-selection-select > .button-cancel").on('click', function() {
if (parent.$.colorbox) {
parent.$.colorbox.selectedData = [];
parent.$.colorbox.selectedData = null;
parent.$.colorbox.close();
};
});

View File

@@ -0,0 +1 @@
@Display(Model.Content)