Fixes #38 using custom uploadify

diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php
index 395651ca95ec77eafa65b651982a4919f22ecb0f..3d3e67b58f6513421468a73929ffb329cdf06db3 100644 (file)
--- 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 884d53f024117db46e250014a1cff8b341206c53..1228fe3f1dcb68430e87511f30f3a4a2dcbe07ce 100644 (file)
--- 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 (file)
index 16c5c08..0000000
--- 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>
-