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

Merge pull request #190 from corgibytes/media_dialog_fixes 

Adjusted the interaction with the media dialog.
This commit is contained in:
Didier Lafforgue 2011-08-31 14:53:16 -07:00
parent 6a2f0f17dd d49453dfc8
commit f81d3a698f
4 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/javascripts/admin/plugins/imagepicker.js
View File

@ -61,8 +61,6 @@ $.fn.imagepicker = function(options) {
asset.removeClass('new-asset');
$('.asset-picker p.no-items').hide();
$('.asset-picker ul').scrollTo($('li.asset:last'), 400);
}
});

2
public/javascripts/admin/plugins/tiny_mce/plugins/locomedia/css/style.css vendored
View File

@ -20,7 +20,7 @@ p.no-items {
ul.assets {
overflow: auto;
height: 571px;
height: 275px;
}
ul.assets li.asset h4 a {

1
public/javascripts/admin/plugins/tiny_mce/plugins/locomedia/dialog.htm vendored
View File

@ -15,7 +15,6 @@
<script src="/javascripts/admin/plugins/plupload/plupload.html5.min.js" type="text/javascript"></script>
<script src="/javascripts/admin/plugins/plupload/jquery.plupload.queue.min.js" type="text/javascript"></script>
<script src="/javascripts/admin/plugins/plupload/jquery.plupload.queue.min.js" type="text/javascript"></script>
<script src="/javascripts/admin/plugins/scrollTo.js" type="text/javascript"></script>
<script type="text/javascript" src="js/dialog.js"></script>

2
public/javascripts/admin/plugins/tiny_mce/plugins/locomedia/js/dialog.js vendored
View File

@ -174,8 +174,6 @@ var MediafileDialog = {
asset.removeClass('new-asset');
$('p.no-items').hide();
$('ul').scrollTo($('li.asset:last'), 400);
},
_destroyAsset: function(asset) {