From d88a39bfcf13a69dc08159ca87132f68c107b2d9 Mon Sep 17 00:00:00 2001
From: Steffen Kamper <info@sk-typo3.de>
Date: Thu, 23 Sep 2010 21:11:59 +0000
Subject: [PATCH] Follow-up to 15691: Javascript Error in taskcenter

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8864 709f56b5-9817-0410-a4d7-c38de5d9e867
---
 ChangeLog                               |  4 ++
 typo3/sysext/taskcenter/res/tasklist.js | 46 +++++++++++++++++++++++
 typo3/sysext/taskcenter/task/index.php  | 49 +------------------------
 3 files changed, 51 insertions(+), 48 deletions(-)
 create mode 100644 typo3/sysext/taskcenter/res/tasklist.js

diff --git a/ChangeLog b/ChangeLog
index a47f2b8bb54d..5f128d52905c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-21  Steffen Kamper  <steffen@typo3.org>
+
+	* Follow-up to 15691: Javascript Error in taskcenter
+
 2010-09-23  Ernesto Baschny  <ernst@cron-it.de>
 
 	* Fixed bug #15770: Module menu and content area are empty if certain extensions are installed (e.g. llxmltranslate)
diff --git a/typo3/sysext/taskcenter/res/tasklist.js b/typo3/sysext/taskcenter/res/tasklist.js
new file mode 100644
index 000000000000..15b0e0db256a
--- /dev/null
+++ b/typo3/sysext/taskcenter/res/tasklist.js
@@ -0,0 +1,46 @@
+Event.observe(document, "dom:loaded", function(){
+	var changeEffect;
+	Sortable.create("task-list", { handles:$$("#task-list .drag"), tag: "li", ghosting:false, overlap:"vertical", constraint:false,
+	 onChange: function(item) {
+		 var list = Sortable.options(item).element;
+		 // deactivate link
+		$$("#task-list a").each(function(link) {
+			link.writeAttribute("onclick","return false;");
+		});
+
+	 },
+
+	 onUpdate: function(list) {
+		 new Ajax.Request("ajax.php", {
+			 method: "post",
+			 parameters: { ajaxID :"Taskcenter::saveSortingState", data:  Sortable.serialize(list)}
+		 });
+			// activate link
+		 Event.observe(window,"mouseup",function(){
+			$$("#task-list a").each(function(link) {
+				link.writeAttribute("onclick","");
+			});
+		});
+
+	 }
+	});
+
+	$$("#taskcenter-menu .down").invoke("observe", "click", function(event){
+		var item = Event.element(event);
+		var itemParent = item.up();
+		item = item.next("div").next("div").next("div").next("div");
+
+		if (itemParent.hasClassName("expanded")) {
+			itemParent.removeClassName("expanded").addClassName("collapsed");
+			Effect.BlindUp(item, {duration : 0.5});
+			state = 1;
+		} else {
+			itemParent.removeClassName("collapsed").addClassName("expanded");
+			Effect.BlindDown(item, {duration : 0.5});
+			state = 0;
+		}
+		new Ajax.Request("ajax.php", {
+			parameters : "ajaxID=Taskcenter::saveCollapseState&item=" + itemParent.id + "&state=" + state
+		});
+	});
+});
diff --git a/typo3/sysext/taskcenter/task/index.php b/typo3/sysext/taskcenter/task/index.php
index ab3a1274d7c7..3d43d2955ef6 100755
--- a/typo3/sysext/taskcenter/task/index.php
+++ b/typo3/sysext/taskcenter/task/index.php
@@ -96,54 +96,6 @@ class SC_mod_user_task_index extends t3lib_SCbase {
 			function jumpToUrl(URL) {
 				document.location = URL;
 			}
-			if ($("#task-list")) {
-				Event.observe(document, "dom:loaded", function(){
-					var changeEffect;
-					Sortable.create("task-list", { handles:$$("#task-list .drag"), tag: "li", ghosting:false, overlap:"vertical", constraint:false,
-					 onChange: function(item) {
-						 var list = Sortable.options(item).element;
-						 // deactivate link
-						$$("#task-list a").each(function(link) {
-							link.writeAttribute("onclick","return false;");
-						});
-
-					 },
-
-					 onUpdate: function(list) {
-						 new Ajax.Request("ajax.php", {
-							 method: "post",
-							 parameters: { ajaxID :"Taskcenter::saveSortingState", data:  Sortable.serialize(list)}
-						 });
-							// activate link
-						 Event.observe(window,"mouseup",function(){
-							$$("#task-list a").each(function(link) {
-								link.writeAttribute("onclick","");
-							});
-						});
-
-					 }
-					});
-
-					$$("#taskcenter-menu .down").invoke("observe", "click", function(event){
-						var item = Event.element(event);
-						var itemParent = item.up();
-						item = item.next("div").next("div").next("div").next("div");
-
-						if (itemParent.hasClassName("expanded")) {
-							itemParent.removeClassName("expanded").addClassName("collapsed");
-							Effect.BlindUp(item, {duration : 0.5});
-							state = 1;
-						} else {
-							itemParent.removeClassName("collapsed").addClassName("expanded");
-							Effect.BlindDown(item, {duration : 0.5});
-							state = 0;
-						}
-						new Ajax.Request("ajax.php", {
-							parameters : "ajaxID=Taskcenter::saveCollapseState&item=" + itemParent.id + "&state=" + state
-						});
-					});
-				});
-			}
 		';
 		$this->doc->postCode='
 			<script language="javascript" type="text/javascript">
@@ -311,6 +263,7 @@ class SC_mod_user_task_index extends t3lib_SCbase {
 
 			// change the sorting of items to the user's one
 		if ($mainMenu) {
+			$this->doc->getPageRenderer()->addJsFile(t3lib_extMgm::extRelPath('taskcenter') . 'res/tasklist.js');
 			$userSorting = unserialize($GLOBALS['BE_USER']->uc['taskcenter']['sorting']);
 			if (is_array($userSorting)) {
 				$newSorting = array();
-- 
2.20.1