From db4da3babc0864099c5ab48e3583d0546a2759d8 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 11:39:51 +0200
Subject: First draft for drag and drop

We can change feed category by drag and drop! Need improvements...

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/feedController.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'app/Controllers/feedController.php')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index e4859b110..315665ef3 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -378,6 +378,21 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 	}
 
+	public function moveAction() {
+		if (Minz_Request::isPost()) {
+			$feed_id = Minz_Request::param('f_id');
+			$cat_id = Minz_Request::param('c_id');
+
+			$feedDAO = FreshRSS_Factory::createFeedDao();
+
+			$values = array(
+				'category' => $cat_id,
+			);
+
+			$feedDAO->updateFeed($feed_id, $values);
+		}
+	}
+
 	public function deleteAction() {
 		if (Minz_Request::isPost()) {
 			$id = Minz_Request::param('id');
-- 
cgit v1.2.3


From 408ac31dd8751eba037db216243958d396df1c8e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 19:02:43 +0200
Subject: Hack for dragleave (triggered on children!)

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/feedController.php |  7 ++++++-
 p/scripts/category.js              | 33 ++++++++++++++++++++++++++-------
 2 files changed, 32 insertions(+), 8 deletions(-)

(limited to 'app/Controllers/feedController.php')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 315665ef3..b2b53185e 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -389,7 +389,12 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				'category' => $cat_id,
 			);
 
-			$feedDAO->updateFeed($feed_id, $values);
+			if (!$feedDAO->updateFeed($feed_id, $values)) {
+				Minz_Error::error(
+					404,
+					array('error' => array(_t('error_occurred')))
+				);
+			}
 		}
 	}
 
diff --git a/p/scripts/category.js b/p/scripts/category.js
index 37ad36b17..872d14490 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -4,6 +4,8 @@ var loading = false,
 	dnd_successful = false;
 
 function dragend_process(t) {
+	t.style.display = 'none';
+
 	if (loading) {
 		window.setTimeout(function() {
 			dragend_process(t);
@@ -11,13 +13,13 @@ function dragend_process(t) {
 	}
 
 	if (!dnd_successful) {
+		t.style.display = 'block';
 		t.style.opacity = 1.0;
 	} else {
 		t.parentNode.removeChild(t);
 	}
 }
 
-
 function init_draggable() {
 	if (!(window.$ && window.url_freshrss)) {
 		if (window.console) {
@@ -45,14 +47,31 @@ function init_draggable() {
 	});
 
 	$('.drop-section').on('dragenter', dropzone, function(e) {
-		$(e.target).addClass('drag-hover');
+		$(this).addClass('drag-hover');
+
+		e.preventDefault();
 	});
 	$('.drop-section').on('dragleave', dropzone, function(e) {
-		$(e.target).removeClass('drag-hover');
+		var pos_this = $(this).position(),
+		    scroll_top = $(document).scrollTop(),
+		    top = pos_this.top,
+		    left = pos_this.left,
+		    right = left + $(this).width(),
+		    bottom = top + $(this).height(),
+		    mouse_x = e.originalEvent.screenX,
+		    mouse_y = e.originalEvent.clientY + scroll_top;
+
+		if (left <= mouse_x && mouse_x <= right &&
+			top <= mouse_y && mouse_y <= bottom) {
+			// HACK because dragleave is triggered when hovering children!
+			return;
+		}
+		$(this).removeClass('drag-hover');
 	});
 	$('.drop-section').on('dragover', dropzone, function(e) {
 		e.dataTransfer.dropEffect = "move";
 
+		e.preventDefault();
 		return false;
 	});
 	$('.drop-section').on('drop', dropzone, function(e) {
@@ -70,14 +89,14 @@ function init_draggable() {
 			}
 		}).success(function() {
 			$(e.target).after(e.dataTransfer.getData('text/html'));
-			loading = false;
-		}).complete(function() {
 			dnd_successful = true;
+		}).complete(function() {
+			loading = false;
 		});
 
-		$(e.target).removeClass('drag-hover');
+		$(this).removeClass('drag-hover');
 
-		return false;
+		e.preventDefault();
 	});
 }
 
-- 
cgit v1.2.3