mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 19:30:25 +02:00
Code Issues Releases Wiki Activity

Media-Manager Youtube browser added.

Browse Source
This commit is contained in:
Cameron
2014-01-08 15:51:14 -08:00
parent 7f9326f1a1
commit 3688924e42
10 changed files with 412 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_web/js/core/admin.jquery.css
View File

@@ -19,7 +19,7 @@ a.media-select-icon { text-align:center; vertical-align:middle; margin:1px; bo
a.media-select-icon:hover { border:1px solid red; }
.media-select-container { padding:10px; }
.media-select-active { border: 1px solid silver; }
.media-select-active { opacity: .5; }
.e-moving { background-color: silver; }

63
e107_web/js/core/mediaManager.js
View File

@@ -61,22 +61,22 @@ $(document).ready(function()
var _float = $('#float').val();
if(margin_right !='')
if(margin_right !='' && margin_right !== undefined)
{
style = style + 'margin-right:' + margin_right + 'px;';
}
if(margin_left !='')
if(margin_left !='' && margin_left !== undefined)
{
style = style + 'margin-left:' + margin_left + 'px;';
}
if(margin_top !='')
if(margin_top !='' && margin_top !== undefined)
{
style = style + 'margin-top:' + margin_top + 'px;';
}
if(margin_bottom !='')
if(margin_bottom !='' && margin_bottom !== undefined)
{
style = style + 'margin-bottom:' + margin_bottom + 'px;';
}
@@ -86,7 +86,15 @@ $(document).ready(function()
style = style + 'float:' + _float + ';';
}
if(width === undefined)
{
width = '';
}
if(height === undefined)
{
height = '';
}
// Set the Html / Wysiwyg Value.
var html = '<img class="img-rounded" style=\"' + style + '\" src=\"'+ src +'\" alt=\"\" width=\"' + width + '\" height=\"' + height + '\" />';
@@ -94,12 +102,12 @@ $(document).ready(function()
// Only Do width/height styling on bbcodes --
if(width !='')
if(width !='' && width !== undefined)
{
style = style + 'width:' + width + 'px;';
}
if(height !='')
if(height !='' && height !== undefined)
{
style = style + 'height:' + height + 'px;';
}
@@ -279,6 +287,49 @@ $(document).ready(function()
mediaNav(this,null);
});
// Ajax keyup search. Used by media-browser.
var delay = (function(){
var timer = 0;
return function(callback, ms){
clearTimeout (timer);
timer = setTimeout(callback, ms);
};
})();
$(".e-ajax-keyup").keyup(function(){
var id = $(this).attr("data-target");
var src = $(this).attr("data-src");
var search = $(this).val();
if(search !== null)
{
src = src + '&search=' + encodeURIComponent(search);
}
// alert(src);
$('#'+id).fadeOut('fast');
delay(function(){
if((search.length) >= 3) {
$('#'+id).load(src,function() {
// alert(src);
$('#'+id).fadeIn('fast'); // .slideLeft();
});
}
}, 300 );
});
function mediaNav(e,navid)