Merge branch 'jquery-uploader' of git://github.com/sembrestels/Tidypics

Conflicts:
	start.php
	views/default/photos/css.php

1 files changed, 13 insertions, 0 deletions

diff --git a/start.php b/start.php
index a9e2fa9ef..51cf7fa60 100644
--- a/start.php
+++ b/start.php
@@ -39,6 +39,19 @@ function tidypics_init() {
 	elgg_register_simplecache_view('js/photos/tidypics');
 	elgg_register_js('tidypics', $js, 'footer');
 
+	$js_base = 'mod/lightpics/vendors/jquery-file-upload/js';
+	
+	elgg_register_js('jquery-tmpl', "http://blueimp.github.com/JavaScript-Templates/tmpl.js", 'footer');
+	elgg_register_js('jquery-load-image', "$js_base/vendor/load-image.min.js", 'footer');
+	elgg_register_js('jquery-canvas-to-blob', "$js_base/vendor/canvas-to-blob.min.js", 'footer');
+	elgg_register_js('jquery-image-gallery', "$js_base/vendor/jquery.image-gallery.min.js", 'footer');
+	elgg_register_js('jquery-iframe-transport', "$js_base/jquery.iframe-transport.js", 'footer');
+	
+	elgg_register_js('jquery-fileupload', "$js_base/jquery.fileupload.js", 'footer');
+	elgg_register_js('jquery-fileupload-fp', "$js_base/jquery.fileupload-fp.js", 'footer');
+	elgg_register_js('jquery-fileupload-ui', "$js_base/jquery.fileupload-ui.js", 'footer');
+	elgg_register_js('jquery-fileupload-jui', "$js_base/jquery.fileupload-jui.js", 'footer');
+	
 	// Add photos link to owner block/hover menus
 	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu');