diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-07-14 11:21:37 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-07-14 11:21:37 -0400 |
| commit | ad181ca6fb50ef8761604bd4288b0d452e95e123 (patch) | |
| tree | c2b0107d152eac820b6465e7196d425b2cad18f8 | |
| parent | 47fe584235df04681b6cf185d91a98d2e3f6e30f (diff) | |
| download | elgg-ad181ca6fb50ef8761604bd4288b0d452e95e123.tar.gz elgg-ad181ca6fb50ef8761604bd4288b0d452e95e123.tar.bz2 | |
Fixes #38 using custom uploadify
| -rw-r--r-- | pages/photos/image/upload.php | 2 | ||||
| -rw-r--r-- | start.php | 2 | ||||
| -rw-r--r-- | views/default/tidypics/js/uploader.php | 4 |
3 files changed, 2 insertions, 6 deletions
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)); } @@ -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 @@ - - <script type="text/javascript" src="<?php echo $vars['url']; ?>mod/tidypics/vendors/uploadify/swfobject.js"></script> - <script type="text/javascript" src="<?php echo $vars['url']; ?>mod/tidypics/vendors/uploadify/jquery.uploadify.v2.1.1.min.js"></script> - |