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

Merge pull request #3325 from SimSync/mediamanager_select

Browse Source 
Mediamanager: changed  function call to support dynamically added content
This commit is contained in:
Cameron
2018-07-27 12:19:12 -07:00
committed by GitHub
parent ae08e50413 e8f2b144f0
commit 05be9ce8ba
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_web/js/core/all.jquery.js
View File

@@ -295,9 +295,10 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
e107.behaviors.eDialogClose = { e107.behaviors.eDialogClose = {
attach: function (context, settings) attach: function (context, settings)
{ {
$(context).find('.e-dialog-close').once('e-dialog-close').each(function () //$(context).find('.e-dialog-close').once('e-dialog-close').each(function ()
{ //{
$(this).click(function () // $(this).click(function ()
$(context).on('click', '.e-dialog-close', function()
{ {
var $modal = $('.modal'); var $modal = $('.modal');
var $parentModal = parent.$('.modal'); var $parentModal = parent.$('.modal');
@@ -318,7 +319,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
$parentDismiss.trigger({type: 'click'}); $parentDismiss.trigger({type: 'click'});
} }
}); });
}); //});
} }
}; };

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

@@ -37,7 +37,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
e107.mediaManager.eMediaSelectFileNone(this); e107.mediaManager.eMediaSelectFileNone(this);
}); });
}); });
/*
$(context).find('.e-media-select').once('media-manager-e-media-select').each(function () $(context).find('.e-media-select').once('media-manager-e-media-select').each(function ()
{ {
$(this).on('click', function () $(this).on('click', function ()
@@ -45,8 +45,14 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
e107.mediaManager.eMediaSelect(this); e107.mediaManager.eMediaSelect(this);
}); });
}); });
*/
$(context).on('click', '.e-media-select', function ()
{
e107.mediaManager.eMediaSelect(this);
});
// Must be defined after e-media-select. // Must be defined after e-media-select.
/*
$(context).find('.e-dialog-save').once('media-manager-e-dialog-save').each(function () $(context).find('.e-dialog-save').once('media-manager-e-dialog-save').each(function ()
{ {
$(this).click(function () $(this).click(function ()
@@ -54,6 +60,12 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
e107.mediaManager.eDialogSave(this); e107.mediaManager.eDialogSave(this);
}); });
}); });
*/
$(context).on('click', '.e-dialog-save', function ()
{
e107.mediaManager.eDialogSave(this);
});
// Must be defined after e-media-select. // Must be defined after e-media-select.
$(context).find('.e-media-nav').once('media-manager-e-media-nav').each(function () $(context).find('.e-media-nav').once('media-manager-e-media-nav').each(function ()