Skip to content

Commit 6467826

Browse files
bekosbenjaminch
authored andcommitted
fix(dropdown): unbind toggle element event on scope destroy
Also, change the way disabled dropdownToggle is read from `attrs` instead of element property. Closes angular-ui#1867 Closes angular-ui#1870 Add an optionnal parameter on timepicker object in order to control the visibility of the controls arrows. chore(tests): Add unit tests for arrows control visibility Fixing demo semi colon issue. chore(release): Add unit tests chore(timepicker): Add LOC to check the user's input chore(timepicker): Remove method for showArrowControls option chore(timepicker): Remove Show / Hide option from demo chore(timepicker): Hides <tr> element rather than <td> element. chore(tests): Simplify arrows control visibility tests chore(tests): Refactoring arrow visibility tests refactor(rating): use `track by` in template Closes angular-ui#1724 refactor(pagination): add `href` and `track by` in templates Closes angular-ui#1725 fix(progressbar): allow fractional values for bar width * Fractions are limited to two decimals, and are not included in aria values. Closes angular-ui#1761 fix(dropdown): use $animate for adding and removing classes Closes angular-ui#1644 feat(datepicker): add `datepicker-mode`, `init-date` & today hint * Add two-way binded `datepicker-mode`. * Add optional `init-date` when no model value is specified. * Add hint for current date. * Use isolated scope for popup directive. * Use optional binding for `isOpen`. * Split each mode into it's own directive. Closes angular-ui#1599 BREAKING CHANGE: `show-weeks` is no longer a watched attribute `*-format` attributes have been renamed to `format-*` `min` attribute has been renamed to `min-date` `max` attribute has been renamed to `max-date` refactor(rating): evaluate attributes inside init function Closes angular-ui#1590 Closes angular-ui#1768 refactor(pagination): remove unused watch Closes angular-ui#1769 fix(typeahead): correctly higlight numeric matches Fixes angular-ui#1777 refactor(typeahead): use `ng-if` and `track by` in template Closes angular-ui#1722 demo(typeahead): correct demo for asyn results Fixes angular-ui#1740 refactor(datepicker): track buttons by date instead of $index refactor(pagination): move boundary & directions to the template Closes angular-ui#795 Closes angular-ui#1770 feat(alert): add WAI-ARIA markup Closes angular-ui#1806 chore(demo): fix fork button width Closes angular-ui#1805 fix(datepicker): `Today` button should not set time Fixes angular-ui#1726 Closes angular-ui#1808 fix(progressbar): number filter in bar template and only for percent Closes angular-ui#1807 refactor(dropdown): remove isolated scope Closes angular-ui#1818 feat(typeahead): add WAI-ARIA markup Closes angular-ui#1814 refactor(accordion): transclude function in compile is deprecated. Closes angular-ui#1789 refactor(carousel): use `track by` in template Closes angular-ui#1723 fix(datepicker): mark input field as invalid if the date is invalid Closes angular-ui#1845 Conflicts: src/datepicker/datepicker.js src/datepicker/test/datepicker.spec.js
1 parent c635ff0 commit 6467826

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

Diff for: src/datepicker/datepicker.js

+12
Original file line numberDiff line numberDiff line change
@@ -320,18 +320,30 @@ function ($compile, $parse, $document, $position, dateFilter, datepickerPopupCon
320320
var dateFormat,
321321
closeOnDateSelection = angular.isDefined(attrs.closeOnDateSelection) ? scope.$parent.$eval(attrs.closeOnDateSelection) : datepickerPopupConfig.closeOnDateSelection,
322322
appendToBody = angular.isDefined(attrs.datepickerAppendToBody) ? scope.$parent.$eval(attrs.datepickerAppendToBody) : datepickerPopupConfig.appendToBody;
323+
<<<<<<< HEAD
324+
=======
323325

324326
scope.showButtonBar = angular.isDefined(attrs.showButtonBar) ? scope.$parent.$eval(attrs.showButtonBar) : datepickerPopupConfig.showButtonBar;
325327

326328
scope.getText = function( key ) {
327329
return scope[key + 'Text'] || datepickerPopupConfig[key + 'Text'];
328330
};
331+
>>>>>>> 76acfef... refactor(rating): use `track by` in template
332+
333+
scope.showButtonBar = angular.isDefined(attrs.showButtonBar) ? scope.$parent.$eval(attrs.showButtonBar) : datepickerPopupConfig.showButtonBar;
334+
335+
<<<<<<< HEAD
336+
scope.getText = function( key ) {
337+
return scope[key + 'Text'] || datepickerPopupConfig[key + 'Text'];
338+
};
329339

330340
attrs.$observe('datepickerPopup', function(value) {
331341
dateFormat = value || datepickerPopupConfig.datepickerPopup;
332342
ngModel.$render();
333343
});
334344

345+
=======
346+
>>>>>>> 76acfef... refactor(rating): use `track by` in template
335347
// popup element used to display calendar
336348
var popupEl = angular.element('<div datepicker-popup-wrap><div datepicker></div></div>');
337349
popupEl.attr({

Diff for: src/datepicker/test/datepicker.spec.js

+3
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,7 @@ describe('datepicker directive', function () {
795795

796796
});
797797

798+
<<<<<<< HEAD
798799
describe('setting datepickerPopupConfig', function() {
799800
var originalConfig = {};
800801
beforeEach(inject(function(datepickerPopupConfig) {
@@ -815,6 +816,8 @@ describe('datepicker directive', function () {
815816

816817
});
817818

819+
=======
820+
>>>>>>> 76acfef... refactor(rating): use `track by` in template
818821
describe('as popup', function () {
819822
var inputEl, dropdownEl, changeInputValueTo, $document;
820823

0 commit comments

Comments
 (0)