summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2013-11-21 13:43:25 +0100
committerFabio Bas <ctrlaltca@gmail.com>2013-11-26 11:42:51 +0100
commite28e9c523167a7aaa707564261584cb4b4fb8ee4 (patch)
tree7aa04c42c78f8b5c0b7e12b4a585793a6c2a092a
parent2594d162d3ab7c78eb24d5dd35b3d8a21e6a038d (diff)
Ported TActiveDatePicker
-rw-r--r--framework/Web/Javascripts/packages.php2
-rwxr-xr-xframework/Web/Javascripts/source/prado/activecontrols/activedatepicker.js6
-rw-r--r--framework/Web/Javascripts/source/prado/datepicker/datepicker.js2
3 files changed, 5 insertions, 5 deletions
diff --git a/framework/Web/Javascripts/packages.php b/framework/Web/Javascripts/packages.php
index 65887c02..4743a000 100644
--- a/framework/Web/Javascripts/packages.php
+++ b/framework/Web/Javascripts/packages.php
@@ -116,12 +116,12 @@ $dependencies = array(
'activefileupload' => array('jquery', 'prado', 'ajax', 'activefileupload'),
'effects' => array('jquery', 'jqueryui'),
'datepicker' => array('jquery', 'prado', 'datepicker'),
+ 'activedatepicker' => array('jquery', 'prado', 'datepicker', 'ajax', 'activedatepicker'),
/*
'colorpicker' => array('prototype', 'prado', 'colorpicker'),
'dragdrop' => array('prototype', 'prado', 'effects', 'ajax', 'dragdrop'),
'slider' => array('prototype', 'prado', 'slider'),
'keyboard' => array('prototype', 'prado', 'keyboard'),
- 'activedatepicker' => array('prototype', 'prado', 'datepicker', 'ajax', 'activedatepicker'),
'dragdropextra' => array('prototype', 'prado', 'effects', 'ajax', 'dragdrop','dragdropextra'),
'accordion' => array('prototype', 'prado', 'effects', 'accordion'),
'htmlarea' => array('prototype', 'prado', 'htmlarea'),
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/activedatepicker.js b/framework/Web/Javascripts/source/prado/activecontrols/activedatepicker.js
index b6d94b0b..c0268077 100755
--- a/framework/Web/Javascripts/source/prado/activecontrols/activedatepicker.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/activedatepicker.js
@@ -6,7 +6,7 @@ Prado.WebUI.TActiveDatePicker = jQuery.klass(Prado.WebUI.TDatePicker,
onInit : function(options)
{
this.options = options || [];
- this.control = $(options.ID);
+ this.control = $('#'+options.ID).get(0);
this.dateSlot = new Array(42);
this.weekSlot = new Array(6);
this.minimalDaysInFirstWeek = 4;
@@ -17,7 +17,7 @@ Prado.WebUI.TActiveDatePicker = jQuery.klass(Prado.WebUI.TDatePicker,
//which element to trigger to show the calendar
if(this.options.Trigger)
{
- this.trigger = $(this.options.Trigger) ;
+ this.trigger = $('#'+this.options.Trigger).get(0) ;
var triggerEvent = this.options.TriggerEvent || "click";
}
else
@@ -32,7 +32,7 @@ Prado.WebUI.TActiveDatePicker = jQuery.klass(Prado.WebUI.TDatePicker,
this.positionMode = this.options.PositionMode;
}
- Object.extend(this,options);
+ jQuery.extend(this,options);
if (this.options.ShowCalendar)
this.observe(this.trigger, triggerEvent, jQuery.proxy(this.show,this));
diff --git a/framework/Web/Javascripts/source/prado/datepicker/datepicker.js b/framework/Web/Javascripts/source/prado/datepicker/datepicker.js
index ccb32c85..e74f586a 100644
--- a/framework/Web/Javascripts/source/prado/datepicker/datepicker.js
+++ b/framework/Web/Javascripts/source/prado/datepicker/datepicker.js
@@ -431,7 +431,7 @@ Prado.WebUI.TDatePicker = jQuery.klass(Prado.WebUI.Control,
obj.changeeventtimer = null;
}
obj.changeeventtimer = setTimeout(
- function() { obj.changeeventtimer = null; element.trigger("change"); },
+ function() { obj.changeeventtimer = null; jQuery(element).trigger("change"); },
1500
);
}