Skip to content

Commit 2d40031

Browse files
MorgulMorgul
committed
...uh, changes?
1 parent f032bec commit 2d40031

File tree

5 files changed

+85
-28
lines changed

5 files changed

+85
-28
lines changed

‎docs/ui-bootstrap-csp.css‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,29 @@
44
-webkit-transition: 0s ease-in-out left;
55
transition: 0s ease-in-out left
66
}
7+
.fa-svg-icon {
8+
display: inline-block;
9+
vertical-align: middle;
10+
min-width: 1em;
11+
min-height: 1em;
12+
height: 100%;
13+
position: relative;
14+
top: -1px;
15+
}
16+
17+
.fa-svg-icon svg {
18+
position: absolute;
19+
top: 0;
20+
left: 0;
21+
width: 100%;
22+
height: 100%;
23+
}
24+
25+
.fa-svg-icon svg g,
26+
.fa-svg-icon svg path {
27+
fill: currentColor;
28+
}
29+
730
.uib-datepicker .uib-title {
831
width: 100%;
932
}

‎docs/ui-bootstrap-tpls.js‎

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* ui-bootstrap4
33
* http://morgul.github.io/ui-bootstrap4/
44
5-
* Version: 3.0.3 - 2018-03-12
5+
* Version: 3.0.5 - 2018-10-03
66
* License: MIT
7-
*/angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse","ui.bootstrap.tabindex","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.datepicker","ui.bootstrap.position","ui.bootstrap.datepickerPopup","ui.bootstrap.debounce","ui.bootstrap.multiMap","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
7+
*/angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse","ui.bootstrap.tabindex","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.common","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.datepicker","ui.bootstrap.position","ui.bootstrap.datepickerPopup","ui.bootstrap.debounce","ui.bootstrap.multiMap","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
88
angular.module("ui.bootstrap.tpls", ["uib/template/accordion/accordion-group.html","uib/template/accordion/accordion.html","uib/template/alert/alert.html","uib/template/carousel/carousel.html","uib/template/carousel/slide.html","uib/template/datepicker/datepicker.html","uib/template/datepicker/day.html","uib/template/datepicker/month.html","uib/template/datepicker/year.html","uib/template/datepickerPopup/popup.html","uib/template/modal/window.html","uib/template/pager/pager.html","uib/template/pagination/pagination.html","uib/template/tooltip/tooltip-html-popup.html","uib/template/tooltip/tooltip-popup.html","uib/template/tooltip/tooltip-template-popup.html","uib/template/popover/popover-html.html","uib/template/popover/popover-template.html","uib/template/popover/popover.html","uib/template/progressbar/bar.html","uib/template/progressbar/progress.html","uib/template/progressbar/progressbar.html","uib/template/rating/rating.html","uib/template/tabs/tab.html","uib/template/tabs/tabset.html","uib/template/timepicker/timepicker.html","uib/template/typeahead/typeahead-match.html","uib/template/typeahead/typeahead-popup.html"]);
99
angular.module('ui.bootstrap.collapse', [])
1010

@@ -699,7 +699,7 @@ angular.module('ui.bootstrap.carousel', [])
699699
return attrs.templateUrl || 'uib/template/carousel/carousel.html';
700700
},
701701
scope: {
702-
active: '=',
702+
active: '=?',
703703
interval: '=',
704704
noTransition: '=',
705705
noPause: '=',
@@ -786,6 +786,8 @@ function($animateCss) {
786786
};
787787
}]);
788788

789+
angular.module('ui.bootstrap.common', []);
790+
789791
angular.module('ui.bootstrap.dateparser', [])
790792

791793
.service('uibDateParser', ['$log', '$locale', 'dateFilter', 'orderByFilter', 'filterFilter', function($log, $locale, dateFilter, orderByFilter, filterFilter) {
@@ -3420,7 +3422,6 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
34203422
return;
34213423
}
34223424

3423-
openScope.focusToggleElement();
34243425
openScope.isOpen = false;
34253426

34263427
if (!$rootScope.$$phase) {
@@ -3510,7 +3511,7 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
35103511

35113512
scope.focusDropdownEntry = function(keyCode) {
35123513
var elems = self.dropdownMenu ? //If append to body is used.
3513-
angular.element(self.dropdownMenu).find('a') :
3514+
angular.element(self.dropdownMenu).find('.dropdown-item') :
35143515
$element.find('div').eq(0).find('a.');
35153516

35163517
switch (keyCode) {
@@ -3629,7 +3630,7 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
36293630

36303631
self.dropdownMenu.css(css);
36313632
}
3632-
3633+
36333634
// find openContainer by uib-dropdown-menu directive
36343635
var openContainer = appendTo ? appendTo : angular.element($element[0].querySelector("[uib-dropdown-menu]"));
36353636
var dropdownOpenClass = appendTo ? appendToOpenClass : openClass;
@@ -3643,10 +3644,10 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
36433644
} else {
36443645
toggleClass = isOpen ? 'addClass' : 'removeClass';
36453646
}
3646-
3647+
36473648
// original Bootstrap 4 dropdown sets openClass on both dropdownMenu and element
36483649
$animate[toggleClass]($element, dropdownOpenClass);
3649-
3650+
36503651
$animate[toggleClass](openContainer, dropdownOpenClass).then(function() {
36513652
if (angular.isDefined(isOpen) && isOpen !== wasOpen) {
36523653
toggleInvoker($scope, { open: !!isOpen });
@@ -3662,6 +3663,7 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
36623663
var newEl = dropdownElement;
36633664
self.dropdownMenu.replaceWith(newEl);
36643665
self.dropdownMenu = newEl;
3666+
$animate.addClass(self.dropdownMenu, dropdownOpenClass);
36653667
$document.on('keydown', uibDropdownService.keybindFilter);
36663668
});
36673669
});
@@ -3747,6 +3749,21 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
37473749

37483750
element.on('click', toggleDropdown);
37493751

3752+
var openDropdown = function(event) {
3753+
if (event.which === 40 && !dropdownCtrl.isOpen()) {
3754+
event.preventDefault();
3755+
event.stopPropagation();
3756+
3757+
if (!element.hasClass('disabled') && !attrs.disabled) {
3758+
scope.$apply(function() {
3759+
dropdownCtrl.toggle();
3760+
});
3761+
}
3762+
}
3763+
};
3764+
3765+
element.on('keydown', openDropdown);
3766+
37503767
// WAI-ARIA
37513768
element.attr({ 'aria-haspopup': true, 'aria-expanded': false });
37523769
scope.$watch(dropdownCtrl.isOpen, function(isOpen) {
@@ -3755,6 +3772,7 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
37553772

37563773
scope.$on('$destroy', function() {
37573774
element.off('click', toggleDropdown);
3775+
element.off('keydown', openDropdown);
37583776
});
37593777
}
37603778
};
@@ -7491,17 +7509,13 @@ angular.module("uib/template/alert/alert.html", []).run(["$templateCache", funct
74917509
angular.module("uib/template/carousel/carousel.html", []).run(["$templateCache", function ($templateCache) {
74927510
$templateCache.put("uib/template/carousel/carousel.html",
74937511
"<div class=\"carousel-inner\" ng-transclude></div>\n" +
7494-
"<a role=\"button\" href class=\"left carousel-control\" ng-click=\"prev()\" ng-class=\"{ disabled: isPrevDisabled() }\" ng-show=\"slides.length > 1\">\n" +
7495-
" <span aria-hidden=\"true\" class=\"fa-svg-icon\">\n" +
7496-
" <svg width=\"1792\" height=\"1792\" viewBox=\"0 0 1792 1792\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M1427 301l-531 531 531 531q19 19 19 45t-19 45l-166 166q-19 19-45 19t-45-19l-742-742q-19-19-19-45t19-45l742-742q19-19 45-19t45 19l166 166q19 19 19 45t-19 45z\"/></svg>\n" +
7497-
" </span>\n" +
7498-
" <span class=\"sr-only\">previous</span>\n" +
7512+
"<a role=\"button\" href class=\"carousel-control-prev\" ng-click=\"prev()\" ng-class=\"{ disabled: isPrevDisabled() }\" ng-show=\"slides.length > 1\">\n" +
7513+
" <span class=\"carousel-control-prev-icon\" aria-hidden=\"true\"></span>\n" +
7514+
" <span class=\"sr-only\">Previous</span>\n" +
74997515
"</a>\n" +
7500-
"<a role=\"button\" href class=\"right carousel-control\" ng-click=\"next()\" ng-class=\"{ disabled: isNextDisabled() }\" ng-show=\"slides.length > 1\">\n" +
7501-
" <span aria-hidden=\"true\" class=\"fa-svg-icon\">\n" +
7502-
" <svg width=\"1792\" height=\"1792\" viewBox=\"0 0 1792 1792\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M1363 877l-742 742q-19 19-45 19t-45-19l-166-166q-19-19-19-45t19-45l531-531-531-531q-19-19-19-45t19-45l166-166q19-19 45-19t45 19l742 742q19 19 19 45t-19 45z\"/></svg>\n" +
7503-
" </span>\n" +
7504-
" <span class=\"sr-only\">next</span>\n" +
7516+
"<a role=\"button\" href class=\"carousel-control-next\" ng-click=\"next()\" ng-class=\"{ disabled: isNextDisabled() }\" ng-show=\"slides.length > 1\">\n" +
7517+
" <span class=\"carousel-control-next-icon\" aria-hidden=\"true\"></span>\n" +
7518+
" <span class=\"sr-only\">Next</span>\n" +
75057519
"</a>\n" +
75067520
"<ol class=\"carousel-indicators\" ng-show=\"slides.length > 1\">\n" +
75077521
" <li ng-repeat=\"slide in slides | orderBy:indexOfSlide track by $index\" ng-class=\"{ active: isActive(slide) }\" ng-click=\"select(slide)\">\n" +
@@ -7907,6 +7921,7 @@ angular.module("uib/template/typeahead/typeahead-popup.html", []).run(["$templat
79077921
"");
79087922
}]);
79097923
angular.module('ui.bootstrap.carousel').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibCarouselCss && angular.element(document).find('head').prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>'); angular.$$uibCarouselCss = true; });
7924+
angular.module('ui.bootstrap.common').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibCommonCss && angular.element(document).find('head').prepend('<style type="text/css">.fa-svg-icon{display:inline-block;vertical-align:middle;min-width:1em;min-height:1em;height:100%;position:relative;top:-1px;}.fa-svg-icon svg{position:absolute;top:0;left:0;width:100%;height:100%;}.fa-svg-icon svg g,.fa-svg-icon svg path{fill:currentColor;}</style>'); angular.$$uibCommonCss = true; });
79107925
angular.module('ui.bootstrap.datepicker').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibDatepickerCss && angular.element(document).find('head').prepend('<style type="text/css">.uib-datepicker .uib-title{width:100%;}.uib-day button,.uib-month button,.uib-year button{min-width:100%;}.uib-left,.uib-right{width:100%}</style>'); angular.$$uibDatepickerCss = true; });
79117926
angular.module('ui.bootstrap.position').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibPositionCss && angular.element(document).find('head').prepend('<style type="text/css">.uib-position-measure{display:block !important;visibility:hidden !important;position:absolute !important;top:-9999px !important;left:-9999px !important;}.uib-position-scrollbar-measure{position:absolute !important;top:-9999px !important;width:50px !important;height:50px !important;overflow:scroll !important;}.uib-position-body-scrollbar-measure{overflow:scroll !important;}</style>'); angular.$$uibPositionCss = true; });
79127927
angular.module('ui.bootstrap.datepickerPopup').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibDatepickerpopupCss && angular.element(document).find('head').prepend('<style type="text/css">.uib-datepicker-popup.dropdown-menu{display:block;float:none;margin:0;}.uib-button-bar{padding:10px;}</style>'); angular.$$uibDatepickerpopupCss = true; });

‎docs/ui-bootstrap.js‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* ui-bootstrap4
33
* http://morgul.github.io/ui-bootstrap4/
44
5-
* Version: 3.0.3 - 2018-03-12
5+
* Version: 3.0.5 - 2018-10-03
66
* License: MIT
7-
*/angular.module("ui.bootstrap", ["ui.bootstrap.collapse","ui.bootstrap.tabindex","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.datepicker","ui.bootstrap.position","ui.bootstrap.datepickerPopup","ui.bootstrap.debounce","ui.bootstrap.multiMap","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
7+
*/angular.module("ui.bootstrap", ["ui.bootstrap.collapse","ui.bootstrap.tabindex","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.common","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.datepicker","ui.bootstrap.position","ui.bootstrap.datepickerPopup","ui.bootstrap.debounce","ui.bootstrap.multiMap","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
88
angular.module('ui.bootstrap.collapse', [])
99

1010
.directive('uibCollapse', ['$animate', '$q', '$parse', '$injector', function($animate, $q, $parse, $injector) {
@@ -698,7 +698,7 @@ angular.module('ui.bootstrap.carousel', [])
698698
return attrs.templateUrl || 'uib/template/carousel/carousel.html';
699699
},
700700
scope: {
701-
active: '=',
701+
active: '=?',
702702
interval: '=',
703703
noTransition: '=',
704704
noPause: '=',
@@ -785,6 +785,8 @@ function($animateCss) {
785785
};
786786
}]);
787787

788+
angular.module('ui.bootstrap.common', []);
789+
788790
angular.module('ui.bootstrap.dateparser', [])
789791

790792
.service('uibDateParser', ['$log', '$locale', 'dateFilter', 'orderByFilter', 'filterFilter', function($log, $locale, dateFilter, orderByFilter, filterFilter) {
@@ -3419,7 +3421,6 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
34193421
return;
34203422
}
34213423

3422-
openScope.focusToggleElement();
34233424
openScope.isOpen = false;
34243425

34253426
if (!$rootScope.$$phase) {
@@ -3509,7 +3510,7 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
35093510

35103511
scope.focusDropdownEntry = function(keyCode) {
35113512
var elems = self.dropdownMenu ? //If append to body is used.
3512-
angular.element(self.dropdownMenu).find('a') :
3513+
angular.element(self.dropdownMenu).find('.dropdown-item') :
35133514
$element.find('div').eq(0).find('a.');
35143515

35153516
switch (keyCode) {
@@ -3628,7 +3629,7 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
36283629

36293630
self.dropdownMenu.css(css);
36303631
}
3631-
3632+
36323633
// find openContainer by uib-dropdown-menu directive
36333634
var openContainer = appendTo ? appendTo : angular.element($element[0].querySelector("[uib-dropdown-menu]"));
36343635
var dropdownOpenClass = appendTo ? appendToOpenClass : openClass;
@@ -3642,10 +3643,10 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
36423643
} else {
36433644
toggleClass = isOpen ? 'addClass' : 'removeClass';
36443645
}
3645-
3646+
36463647
// original Bootstrap 4 dropdown sets openClass on both dropdownMenu and element
36473648
$animate[toggleClass]($element, dropdownOpenClass);
3648-
3649+
36493650
$animate[toggleClass](openContainer, dropdownOpenClass).then(function() {
36503651
if (angular.isDefined(isOpen) && isOpen !== wasOpen) {
36513652
toggleInvoker($scope, { open: !!isOpen });
@@ -3661,6 +3662,7 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
36613662
var newEl = dropdownElement;
36623663
self.dropdownMenu.replaceWith(newEl);
36633664
self.dropdownMenu = newEl;
3665+
$animate.addClass(self.dropdownMenu, dropdownOpenClass);
36643666
$document.on('keydown', uibDropdownService.keybindFilter);
36653667
});
36663668
});
@@ -3746,6 +3748,21 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
37463748

37473749
element.on('click', toggleDropdown);
37483750

3751+
var openDropdown = function(event) {
3752+
if (event.which === 40 && !dropdownCtrl.isOpen()) {
3753+
event.preventDefault();
3754+
event.stopPropagation();
3755+
3756+
if (!element.hasClass('disabled') && !attrs.disabled) {
3757+
scope.$apply(function() {
3758+
dropdownCtrl.toggle();
3759+
});
3760+
}
3761+
}
3762+
};
3763+
3764+
element.on('keydown', openDropdown);
3765+
37493766
// WAI-ARIA
37503767
element.attr({ 'aria-haspopup': true, 'aria-expanded': false });
37513768
scope.$watch(dropdownCtrl.isOpen, function(isOpen) {
@@ -3754,6 +3771,7 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
37543771

37553772
scope.$on('$destroy', function() {
37563773
element.off('click', toggleDropdown);
3774+
element.off('keydown', openDropdown);
37573775
});
37583776
}
37593777
};
@@ -7458,6 +7476,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
74587476
};
74597477
}]);
74607478
angular.module('ui.bootstrap.carousel').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibCarouselCss && angular.element(document).find('head').prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>'); angular.$$uibCarouselCss = true; });
7479+
angular.module('ui.bootstrap.common').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibCommonCss && angular.element(document).find('head').prepend('<style type="text/css">.fa-svg-icon{display:inline-block;vertical-align:middle;min-width:1em;min-height:1em;height:100%;position:relative;top:-1px;}.fa-svg-icon svg{position:absolute;top:0;left:0;width:100%;height:100%;}.fa-svg-icon svg g,.fa-svg-icon svg path{fill:currentColor;}</style>'); angular.$$uibCommonCss = true; });
74617480
angular.module('ui.bootstrap.datepicker').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibDatepickerCss && angular.element(document).find('head').prepend('<style type="text/css">.uib-datepicker .uib-title{width:100%;}.uib-day button,.uib-month button,.uib-year button{min-width:100%;}.uib-left,.uib-right{width:100%}</style>'); angular.$$uibDatepickerCss = true; });
74627481
angular.module('ui.bootstrap.position').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibPositionCss && angular.element(document).find('head').prepend('<style type="text/css">.uib-position-measure{display:block !important;visibility:hidden !important;position:absolute !important;top:-9999px !important;left:-9999px !important;}.uib-position-scrollbar-measure{position:absolute !important;top:-9999px !important;width:50px !important;height:50px !important;overflow:scroll !important;}.uib-position-body-scrollbar-measure{overflow:scroll !important;}</style>'); angular.$$uibPositionCss = true; });
74637482
angular.module('ui.bootstrap.datepickerPopup').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibDatepickerpopupCss && angular.element(document).find('head').prepend('<style type="text/css">.uib-datepicker-popup.dropdown-menu{display:block;float:none;margin:0;}.uib-button-bar{padding:10px;}</style>'); angular.$$uibDatepickerpopupCss = true; });

0 commit comments

Comments
 (0)