Skip to content

Commit 618b665

Browse files
authored
Merge pull request #103 from oscar09/master
fixed issue #100
2 parents 29277ea + 7cb8995 commit 618b665

File tree

7 files changed

+1801
-2304
lines changed

7 files changed

+1801
-2304
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
/.sass-cache
44
/bower_components
55
/css
6+
.idea/

app/picker/js/range-picker.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@ RangePickerCtrl.prototype.endTimeSelected = function(time){
177177

178178
RangePickerCtrl.prototype.setNgModelValue = function(startDate, divider, endDate) {
179179
var self = this;
180+
var momentStartDate = startDate || null;
181+
var momentEndDate = endDate || null;
182+
180183

181184
if(startDate)
182185
{
@@ -188,7 +191,9 @@ RangePickerCtrl.prototype.setNgModelValue = function(startDate, divider, endDate
188191
endDate = endDate.format(self.format) || '';
189192
}
190193

191-
var range = {startDate: startDate, endDate: endDate};
194+
var range = {startDate: startDate, endDate: endDate, startDateAsMoment: momentStartDate, endDateAsMoment: momentEndDate};
195+
196+
//var range = {startDate: startDate, endDate: endDate};
192197
self.rangeSelectCall({range: range});
193198
var _ng_model_value;
194199

app/views/range-picker-api.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</tr>
6565
<tr>
6666
<td>on-range-select</td>
67-
<td>call back function that return selected range as object with startDate and endDate</td>
67+
<td>call back function that return selected range as object with startDate (string), endDate (string), startDateAsMoment (object) and endDateAsMoment (object)</td>
6868
<td>on-range-select="vm.yourCallbackFun(date)"</td>
6969
</tr>
7070
<tr>

dist/scripts/script.min.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1852,6 +1852,9 @@ RangePickerCtrl.prototype.endTimeSelected = function(time){
18521852

18531853
RangePickerCtrl.prototype.setNgModelValue = function(startDate, divider, endDate) {
18541854
var self = this;
1855+
var momentStartDate = startDate || null;
1856+
var momentEndDate = endDate || null;
1857+
18551858

18561859
if(startDate)
18571860
{
@@ -1863,7 +1866,9 @@ RangePickerCtrl.prototype.setNgModelValue = function(startDate, divider, endDate
18631866
endDate = endDate.format(self.format) || '';
18641867
}
18651868

1866-
var range = {startDate: startDate, endDate: endDate};
1869+
var range = {startDate: startDate, endDate: endDate, startDateAsMoment: momentStartDate, endDateAsMoment: momentEndDate};
1870+
1871+
//var range = {startDate: startDate, endDate: endDate};
18671872
self.rangeSelectCall({range: range});
18681873
var _ng_model_value;
18691874

0 commit comments

Comments
 (0)