diff --git a/plugins/box/filesmanager/js/fileuploader.js b/plugins/box/filesmanager/js/fileuploader.js index d272802..f0b3cce 100644 --- a/plugins/box/filesmanager/js/fileuploader.js +++ b/plugins/box/filesmanager/js/fileuploader.js @@ -86,7 +86,7 @@ $.monstra.fileuploader = { }, success: function(data){ $.monstra.fileuploader.setProgress(100); - location.href = $.monstra.fileuploader.conf.uploadUrl; + $.event.trigger('uploaded.fuploader'); }, error: function(){ Messenger().post({ @@ -121,11 +121,3 @@ $.monstra.fileuploader = { this._uploaderObj.find('.upload-file-info').html(fname +' '+ sizeStr); } }; - -$(document).ready(function(){ - $val_fUploaderInit = $('#fUploaderInit').val(); - if ($val_fUploaderInit !== undefined) { - $.monstra.fileuploader.init($.extend({}, {uploaderId:'DgDfileUploader'}, $.parseJSON($val_fUploaderInit))); - } -}); - diff --git a/plugins/box/filesmanager/views/backend/index.view.php b/plugins/box/filesmanager/views/backend/index.view.php index 8f0c2de..fe1451e 100755 --- a/plugins/box/filesmanager/views/backend/index.view.php +++ b/plugins/box/filesmanager/views/backend/index.view.php @@ -1,6 +1,13 @@ -

+ - +

diff --git a/plugins/box/plugins/js/.htaccess b/plugins/box/plugins/js/.htaccess new file mode 100644 index 0000000..b9f48ac --- /dev/null +++ b/plugins/box/plugins/js/.htaccess @@ -0,0 +1,2 @@ +Options -Indexes +Allow from all \ No newline at end of file diff --git a/plugins/box/plugins/js/plugins.js b/plugins/box/plugins/js/plugins.js new file mode 100644 index 0000000..4726bbb --- /dev/null +++ b/plugins/box/plugins/js/plugins.js @@ -0,0 +1,15 @@ +if (typeof $.monstra == 'undefined') $.monstra = {}; + +$.monstra.plugins = { + + init: function(){ + if (window.location.hash && $('a[href="'+ window.location.hash +'"]')) { + $('a[href="'+ window.location.hash +'"]').click(); + } + } + +}; + +$(document).ready(function(){ + $.monstra.plugins.init(); +}); \ No newline at end of file diff --git a/plugins/box/plugins/plugins.admin.php b/plugins/box/plugins/plugins.admin.php index b500d55..cac95fd 100755 --- a/plugins/box/plugins/plugins.admin.php +++ b/plugins/box/plugins/plugins.admin.php @@ -2,6 +2,7 @@ Stylesheet::add('plugins/box/filesmanager/css/style.css', 'backend', 11); Javascript::add('plugins/box/filesmanager/js/fileuploader.js', 'backend', 11); +Javascript::add('plugins/box/plugins/js/plugins.js', 'backend', 11); // Add plugin navigation link Navigation::add(__('Plugins', 'plugins'), 'extends', 'plugins', 1); diff --git a/plugins/box/plugins/views/backend/index.view.php b/plugins/box/plugins/views/backend/index.view.php index 3022c6a..90fd169 100755 --- a/plugins/box/plugins/views/backend/index.view.php +++ b/plugins/box/plugins/views/backend/index.view.php @@ -1,7 +1,5 @@

- -
@@ -156,6 +154,11 @@ } }); }); + $.monstra.fileuploader.init($.extend({}, {uploaderId:'DgDfileUploader'}, )); + $(document).on('uploaded.fuploader', function(){ + location.href = $.monstra.fileuploader.conf.uploadUrl +'#installnew'; + window.location.reload(true); + }); });