From 33416279ddc8a483126ce5a04c0c361fa984dfb6 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Fri, 3 Aug 2012 04:06:44 +0200
Subject: Finally uploaded missing file.

---
 views/default/js/photos/upload.php | 55 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 views/default/js/photos/upload.php

(limited to 'views/default')

diff --git a/views/default/js/photos/upload.php b/views/default/js/photos/upload.php
new file mode 100644
index 000000000..05421125d
--- /dev/null
+++ b/views/default/js/photos/upload.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ *
+ */
+
+?>
+
+elgg.provide('elgg.tidypics.upload');
+
+elgg.tidypics.upload.init = function() {
+	
+	window.locale = {
+		"fileupload": {
+			"error": elgg.echo('tidypics:upload:error'),
+			"errors": {
+				"maxFileSize": elgg.echo('tidypics:upload:maxfilesize'),
+				"minFileSize": elgg.echo('tidypics:upload:minfilesize'),
+				"acceptFileTypes": elgg.echo('tidypics:upload:acceptfiletypes'),
+				"maxNumberOfFiles": elgg.echo('tidypics:upload:maxnumberoffiles'),
+			},
+		}
+	};
+	
+	$.widget('blueimpJUI.fileupload', $.blueimpUI.fileupload, {
+		_transition: function (node) {
+			var that = this,
+				deferred = $.Deferred();
+			if (node.hasClass('fade')) {
+				node.fadeToggle(function () {
+					deferred.resolveWith(node);
+				});
+			} else {
+				deferred.resolveWith(node);
+			}
+			return deferred;
+		},
+	});
+
+	// Initialize the jQuery File Upload widget:
+	$('#fileupload').fileupload();
+
+	// Settings
+	$('#fileupload').fileupload('option', {
+		maxFileSize: 5000000,
+		acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
+		change: function() {
+			elgg.tidypics.upload.fileinput.hide().appendTo($('#fileupload'));
+			elgg.tidypics.upload.fileinput = $('#fileupload .elgg-input-file');
+		},
+	});
+	
+	elgg.tidypics.upload.fileinput = $('#fileupload .elgg-input-file');
+};
+
+elgg.register_hook_handler('init', 'system', elgg.tidypics.upload.init);
-- 
cgit v1.2.3


From a5f23d31518e5b8f00293fde8bc2fbdd481d574b Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Fri, 3 Aug 2012 23:35:38 +0200
Subject: Drop files from desktop disabled (wasn't working).

---
 views/default/js/photos/upload.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'views/default')

diff --git a/views/default/js/photos/upload.php b/views/default/js/photos/upload.php
index 05421125d..82e2696bd 100644
--- a/views/default/js/photos/upload.php
+++ b/views/default/js/photos/upload.php
@@ -3,6 +3,9 @@
  *
  */
 
+$maxfilesize = (int) elgg_get_plugin_setting('maxfilesize', 'tidypics');
+$maxfilesize *= 1024;
+
 ?>
 
 elgg.provide('elgg.tidypics.upload');
@@ -41,12 +44,15 @@ elgg.tidypics.upload.init = function() {
 
 	// Settings
 	$('#fileupload').fileupload('option', {
-		maxFileSize: 5000000,
+		maxFileSize: <?php echo $maxfilesize; ?>,
 		acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
 		change: function() {
 			elgg.tidypics.upload.fileinput.hide().appendTo($('#fileupload'));
 			elgg.tidypics.upload.fileinput = $('#fileupload .elgg-input-file');
 		},
+		drop: function () {
+			return false;
+		}
 	});
 	
 	elgg.tidypics.upload.fileinput = $('#fileupload .elgg-input-file');
-- 
cgit v1.2.3