ENHANCEMENT: CMS JS now uses Entwine

guyvanbael · Jul 17, 2012 · 568971a · 568971a
1 parent 38766d0
commit 568971a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/code/Calendar.php b/code/Calendar.php
@@ -80,7 +80,6 @@ class Calendar extends Page {
 	public function getCMSFields()
 	{
 
-		Requirements::javascript(THIRDPARTY_DIR.'/jquery-livequery/jquery.livequery.js');
 		Requirements::javascript('event_calendar/javascript/calendar_cms.js');
 
 		$f = parent::getCMSFields();
@@ -116,7 +115,7 @@ public function getCMSFields()
 				GridFieldConfig_RecordEditor::create()				
 			));
 
-		$otherCals = DataList::create("Calendar")->exclude("Calendar\".\"ID",$this->ID);
+		$otherCals = Calendar::get()->filter("ID:Negation",$this->ID);
 		if($otherCals->exists()) {				
 			$f->addFieldToTab("Root.$feeds", new CheckboxSetField(
 				'NestedCalendars', 

diff --git a/code/CalendarEvent.php b/code/CalendarEvent.php
@@ -33,7 +33,6 @@ class CalendarEvent extends Page
 
 	public function getCMSFields()
 	{
-		Requirements::javascript(THIRDPARTY_DIR.'/jquery-livequery/jquery.livequery.js');
 		Requirements::javascript('event_calendar/javascript/calendar_cms.js');
 		$f = parent::getCMSFields();
 		$dt = _t('CalendarEvent.DATESANDTIMES','Dates and Times');

diff --git a/javascript/calendar_cms.js b/javascript/calendar_cms.js
@@ -9,11 +9,12 @@ $(function() {
 	}).change();
 
 
-	$('#Recursion').livequery(function() {
+	$('#Recursion').entwine({
+		onmatch: function() {
 
 
-		var $tab = $(this).closest('.tab');
-		var $recursion = $(this);
+		var $tab = this.closest('.tab');
+		var $recursion = this;
 		var $customRecursionType = $tab.find('#CustomRecursionType').hide();
 		var $dailyInterval = $tab.find('.dailyinterval').hide();
 		var $weeklyInterval = $tab.find('.weeklyinterval').hide();
@@ -88,7 +89,7 @@ $(function() {
 
 
 
-	});
+	}});