equal
deleted
inserted
replaced
41 this.get('filter').set(key, intervals); |
41 this.get('filter').set(key, intervals); |
42 }), |
42 }), |
43 dateFilterObserver: Ember.observer('filter.date', function(sender, key) { |
43 dateFilterObserver: Ember.observer('filter.date', function(sender, key) { |
44 key = key.split('.').pop(); |
44 key = key.split('.').pop(); |
45 var intervals = []; |
45 var intervals = []; |
46 this.get('filter').get(key).forEach(function(date) { |
46 this.get('filter').get('date').forEach(function(date) { |
47 var isInterval = false; |
47 var isInterval = false; |
48 intervals.forEach(function(interval) { |
48 intervals.forEach(function(interval) { |
49 if(interval.length && (interval.includes(date + 1) || interval.includes(date - 1))) { |
49 if(interval.length && (interval.includes(date + 1) || interval.includes(date - 1))) { |
50 interval.push(date); |
50 interval.push(date); |
51 isInterval = true; |
51 isInterval = true; |
60 intervals[index] = interval.shift() + '-' + interval.pop(); |
60 intervals[index] = interval.shift() + '-' + interval.pop(); |
61 } else { |
61 } else { |
62 intervals[index] = interval.toString(); |
62 intervals[index] = interval.toString(); |
63 } |
63 } |
64 }); |
64 }); |
65 if(!this.arraysEqual(this.get(key).toArray(), intervals)) { |
65 if(!this.arraysEqual(this.get('date').toArray(), intervals)) { |
66 this.set(key, intervals); |
66 this.set('date', intervals); |
67 } |
67 } |
68 }), |
68 }), |
69 |
69 |
70 arraysEqual: function(a, b) { |
70 arraysEqual: function(a, b) { |
71 if (a === b) { |
71 if (a === b) { |