From ad181ca6fb50ef8761604bd4288b0d452e95e123 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 11:21:37 -0400 Subject: Fixes #38 using custom uploadify --- pages/photos/image/upload.php | 2 +- start.php | 2 +- views/default/tidypics/js/uploader.php | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 views/default/tidypics/js/uploader.php diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php index 395651ca9..3d3e67b58 100644 --- a/pages/photos/image/upload.php +++ b/pages/photos/image/upload.php @@ -43,7 +43,7 @@ if ($uploader == 'basic') { $content = elgg_view('forms/photos/basic_upload', array('entity' => $album)); } else { elgg_load_js('swfobject'); - elgg_load_js('jquery.uploadify'); + elgg_load_js('jquery.uploadify-tp'); elgg_load_js('tidypics:uploading'); $content = elgg_view('forms/photos/ajax_upload', array('entity' => $album)); } diff --git a/start.php b/start.php index 884d53f02..1228fe3f1 100644 --- a/start.php +++ b/start.php @@ -46,7 +46,7 @@ function tidypics_init() { elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.js', 'footer'); elgg_register_js('swfobject', 'mod/tidypics/vendors/uploadify/swfobject.js', 'footer'); - elgg_register_js('jquery.uploadify', 'mod/tidypics/vendors/uploadify/jquery.uploadify.v2.1.1.min.js', 'footer'); + elgg_register_js('jquery.uploadify-tp', 'mod/tidypics/vendors/uploadify/jquery.uploadify.v2.1.1.min.js', 'footer'); // Add photos link to owner block/hover menus elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); diff --git a/views/default/tidypics/js/uploader.php b/views/default/tidypics/js/uploader.php deleted file mode 100644 index 16c5c088d..000000000 --- a/views/default/tidypics/js/uploader.php +++ /dev/null @@ -1,4 +0,0 @@ - - - - -- cgit v1.2.3