Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: angular-ui/bootstrap
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.13.2
Choose a base ref
...
head repository: angular-ui/bootstrap
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.13.3
Choose a head ref
10 contributors
Loading
Showing with 3,372 additions and 1,828 deletions.
  1. +81 −0 CHANGELOG.md
  2. +2 −0 Gruntfile.js
  3. +1 −1 karma.conf.js
  4. +2 −1 misc/demo/assets/plunker.js
  5. +40 −36 misc/demo/index.html
  6. +12 −9 package.json
  7. +9 −4 src/accordion/accordion.js
  8. +9 −7 src/accordion/docs/demo.html
  9. +7 −0 src/accordion/docs/readme.md
  10. +57 −1 src/accordion/test/accordion.spec.js
  11. +8 −5 src/alert/alert.js
  12. +1 −1 src/alert/docs/demo.html
  13. +2 −0 src/alert/docs/readme.md
  14. +27 −2 src/alert/test/alert.spec.js
  15. +4 −2 src/buttons/buttons.js
  16. +2 −0 src/buttons/docs/readme.md
  17. +41 −0 src/buttons/test/buttons.spec.js
  18. +26 −19 src/carousel/carousel.js
  19. +3 −1 src/carousel/docs/README.md
  20. +43 −2 src/carousel/test/carousel.spec.js
  21. +1 −1 src/collapse/docs/demo.html
  22. +16 −0 src/dateparser/dateparser.js
  23. +23 −0 src/dateparser/test/dateparser.spec.js
  24. +57 −25 src/datepicker/datepicker.js
  25. +2 −2 src/datepicker/docs/demo.html
  26. +5 −1 src/datepicker/docs/demo.js
  27. +20 −3 src/datepicker/docs/readme.md
  28. +1,788 −1,591 src/datepicker/test/datepicker.spec.js
  29. +2 −2 src/dropdown/dropdown.js
  30. +3 −11 src/dropdown/test/dropdown.spec.js
  31. +6 −6 src/modal/docs/demo.html
  32. +3 −0 src/modal/docs/readme.md
  33. +80 −13 src/modal/modal.js
  34. +73 −0 src/modal/test/modal.spec.js
  35. +1 −1 src/pagination/docs/demo.html
  36. +4 −0 src/pagination/docs/readme.md
  37. +8 −1 src/pagination/pagination.js
  38. +30 −2 src/pagination/test/pagination.spec.js
  39. +9 −9 src/popover/docs/demo.html
  40. +1 −1 src/popover/docs/readme.md
  41. +2 −2 src/progressbar/docs/demo.html
  42. +2 −2 src/rating/docs/demo.html
  43. +3 −3 src/tabs/docs/demo.html
  44. +3 −3 src/timepicker/docs/demo.html
  45. +8 −0 src/timepicker/docs/readme.md
  46. +657 −2 src/timepicker/test/timepicker.spec.js
  47. +86 −11 src/timepicker/timepicker.js
  48. +2 −2 src/tooltip/docs/readme.md
  49. +35 −1 src/tooltip/test/tooltip.spec.js
  50. +43 −19 src/tooltip/tooltip.js
  51. +1 −1 src/typeahead/docs/readme.md
  52. +1 −1 src/typeahead/test/typeahead.spec.js
  53. +1 −1 src/typeahead/typeahead.js
  54. +2 −2 template/accordion/accordion-group.html
  55. +1 −1 template/carousel/carousel.html
  56. +5 −5 template/pagination/pagination.html
  57. +1 −1 template/progressbar/bar.html
  58. +1 −1 template/progressbar/progressbar.html
  59. +2 −3 template/rating/rating.html
  60. +1 −1 template/tabs/tab.html
  61. +5 −5 template/timepicker/timepicker.html
  62. +1 −1 template/typeahead/typeahead-match.html
81 changes: 81 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,84 @@
<a name"0.13.3"></a>
### 0.13.3 (2015-08-09)


#### Bug Fixes

* **accordion:**
* add `open` class when expanded ([ead15e37](https://github.com/angular-ui/bootstrap/commit/ead15e37), closes [#4152](https://github.com/angular-ui/bootstrap/issues/4152), [#3419](https://github.com/angular-ui/bootstrap/issues/3419))
* revert to empty href ([b18dc8f9](https://github.com/angular-ui/bootstrap/commit/b18dc8f9), closes [#4104](https://github.com/angular-ui/bootstrap/issues/4104))
* **buttons:**
* change to use `attrs.disabled` ([c9b0d0b0](https://github.com/angular-ui/bootstrap/commit/c9b0d0b0), closes [#4088](https://github.com/angular-ui/bootstrap/issues/4088))
* allow selection of undisabled button ([707fbf55](https://github.com/angular-ui/bootstrap/commit/707fbf55), closes [#4088](https://github.com/angular-ui/bootstrap/issues/4088))
* **carousel:**
* fix animation direction ([8359d73f](https://github.com/angular-ui/bootstrap/commit/8359d73f), closes [#4092](https://github.com/angular-ui/bootstrap/issues/4092), [#4087](https://github.com/angular-ui/bootstrap/issues/4087))
* fix sorting of indicators ([8056368e](https://github.com/angular-ui/bootstrap/commit/8056368e), closes [#4071](https://github.com/angular-ui/bootstrap/issues/4071), [#3764](https://github.com/angular-ui/bootstrap/issues/3764))
* **dateparser:** Support 12-hour format and AM/PM ([1ecd82ce](https://github.com/angular-ui/bootstrap/commit/1ecd82ce), closes [#4117](https://github.com/angular-ui/bootstrap/issues/4117))
* **datepicker:**
* commit safe apply on destruction ([74a8be4c](https://github.com/angular-ui/bootstrap/commit/74a8be4c), closes [#4079](https://github.com/angular-ui/bootstrap/issues/4079), [#4076](https://github.com/angular-ui/bootstrap/issues/4076))
* change to `dateDisabled` ([5245ccad](https://github.com/angular-ui/bootstrap/commit/5245ccad), closes [#2773](https://github.com/angular-ui/bootstrap/issues/2773), [#4080](https://github.com/angular-ui/bootstrap/issues/4080))
* **dropdown:** handle `keyboard-nav` correctly ([0b37f088](https://github.com/angular-ui/bootstrap/commit/0b37f088), closes [#4110](https://github.com/angular-ui/bootstrap/issues/4110), [#4091](https://github.com/angular-ui/bootstrap/issues/4091))
* **modal:**
* skipping ESC handling for form inputs ([a05b9c1a](https://github.com/angular-ui/bootstrap/commit/a05b9c1a), closes [#3551](https://github.com/angular-ui/bootstrap/issues/3551), [#2544](https://github.com/angular-ui/bootstrap/issues/2544))
* add `$animateCss` support ([c7f19d58](https://github.com/angular-ui/bootstrap/commit/c7f19d58), closes [#4121](https://github.com/angular-ui/bootstrap/issues/4121), [#4119](https://github.com/angular-ui/bootstrap/issues/4119))
* fix test ([e60c3ff6](https://github.com/angular-ui/bootstrap/commit/e60c3ff6))
* dismiss modal on unschedule destruction ([3584061f](https://github.com/angular-ui/bootstrap/commit/3584061f), closes [#4097](https://github.com/angular-ui/bootstrap/issues/4097), [#3694](https://github.com/angular-ui/bootstrap/issues/3694))
* **progressbar:** fix `min-width` for Bootstrap 3.2 ([8dc13be9](https://github.com/angular-ui/bootstrap/commit/8dc13be9), closes [#4081](https://github.com/angular-ui/bootstrap/issues/4081), [#2511](https://github.com/angular-ui/bootstrap/issues/2511))
* **tooltip:**
* add safety to `$apply` ([22b16f01](https://github.com/angular-ui/bootstrap/commit/22b16f01), closes [#3943](https://github.com/angular-ui/bootstrap/issues/3943), [#4150](https://github.com/angular-ui/bootstrap/issues/4150), [#516](https://github.com/angular-ui/bootstrap/issues/516))
* tooltip w/ template position ([895a2281](https://github.com/angular-ui/bootstrap/commit/895a2281))
* prevent opening when `tooltipPopupDelay` is present ([12c527af](https://github.com/angular-ui/bootstrap/commit/12c527af), closes [#4098](https://github.com/angular-ui/bootstrap/issues/4098), [#3611](https://github.com/angular-ui/bootstrap/issues/3611))
* **typeahead:** return `null` if empty ([c7d3a660](https://github.com/angular-ui/bootstrap/commit/c7d3a660), closes [#4078](https://github.com/angular-ui/bootstrap/issues/4078), [#3176](https://github.com/angular-ui/bootstrap/issues/3176))


#### Features

* **accordion:**
* add `controllerAs` support ([9865ee8e](https://github.com/angular-ui/bootstrap/commit/9865ee8e), closes [#4138](https://github.com/angular-ui/bootstrap/issues/4138))
* add `templateUrl` support ([f777c320](https://github.com/angular-ui/bootstrap/commit/f777c320), closes [#4084](https://github.com/angular-ui/bootstrap/issues/4084))
* **alert:** add `templateUrl` support ([88a885ca](https://github.com/angular-ui/bootstrap/commit/88a885ca), closes [#4139](https://github.com/angular-ui/bootstrap/issues/4139))
* **buttons:** add `controllerAs` support ([02872dc1](https://github.com/angular-ui/bootstrap/commit/02872dc1), closes [#4140](https://github.com/angular-ui/bootstrap/issues/4140))
* **carousel:**
* add `templateUrl` support ([a29c8f20](https://github.com/angular-ui/bootstrap/commit/a29c8f20), closes [#4141](https://github.com/angular-ui/bootstrap/issues/4141))
* expose carousel controller via `controllerAs` ([bfec07e4](https://github.com/angular-ui/bootstrap/commit/bfec07e4), closes [#4131](https://github.com/angular-ui/bootstrap/issues/4131))
* **datepicker:**
* allow custom templates ([e04b06d7](https://github.com/angular-ui/bootstrap/commit/e04b06d7), closes [#4157](https://github.com/angular-ui/bootstrap/issues/4157), [#1913](https://github.com/angular-ui/bootstrap/issues/1913))
* add `onOpenFocus` support ([68afc4c6](https://github.com/angular-ui/bootstrap/commit/68afc4c6), closes [#2303](https://github.com/angular-ui/bootstrap/issues/2303), [#2546](https://github.com/angular-ui/bootstrap/issues/2546), [#4146](https://github.com/angular-ui/bootstrap/issues/4146))
* add support for dynamic `min-mode` and `max-mode` ([f3d263e1](https://github.com/angular-ui/bootstrap/commit/f3d263e1), closes [#3843](https://github.com/angular-ui/bootstrap/issues/3843), [#2618](https://github.com/angular-ui/bootstrap/issues/2618))
* allow suppression of log error ([bab1d375](https://github.com/angular-ui/bootstrap/commit/bab1d375), closes [#3836](https://github.com/angular-ui/bootstrap/issues/3836), [#4115](https://github.com/angular-ui/bootstrap/issues/4115))
* **docs:**
* add explanation of eye icon ([265d429b](https://github.com/angular-ui/bootstrap/commit/265d429b), closes [#4120](https://github.com/angular-ui/bootstrap/issues/4120))
* add ngAnimate Plunker support ([a8a22cff](https://github.com/angular-ui/bootstrap/commit/a8a22cff), closes [#3648](https://github.com/angular-ui/bootstrap/issues/3648), [#4072](https://github.com/angular-ui/bootstrap/issues/4072))
* **modal:**
* add ability to change class on body ([5a28ff76](https://github.com/angular-ui/bootstrap/commit/5a28ff76), closes [#2633](https://github.com/angular-ui/bootstrap/issues/2633), [#4132](https://github.com/angular-ui/bootstrap/issues/4132))
* allow users to resolve with strings ([89368856](https://github.com/angular-ui/bootstrap/commit/89368856), closes [#2676](https://github.com/angular-ui/bootstrap/issues/2676), [#4124](https://github.com/angular-ui/bootstrap/issues/4124))
* **pagination:**
* add classes to assist with styling ([b21c9abd](https://github.com/angular-ui/bootstrap/commit/b21c9abd), closes [#4130](https://github.com/angular-ui/bootstrap/issues/4130), [#4142](https://github.com/angular-ui/bootstrap/issues/4142))
* add `templateUrl` support ([a0e1c91c](https://github.com/angular-ui/bootstrap/commit/a0e1c91c), closes [#4137](https://github.com/angular-ui/bootstrap/issues/4137))
* **timepicker:**
* add documentation for max/min ([87fc242d](https://github.com/angular-ui/bootstrap/commit/87fc242d))
* Added min/max attributes for timepicker. ([6c0010be](https://github.com/angular-ui/bootstrap/commit/6c0010be), closes [#4019](https://github.com/angular-ui/bootstrap/issues/4019))
* **tooltip:**
* remove unnecessary `$digest` ([901a7c66](https://github.com/angular-ui/bootstrap/commit/901a7c66), closes [#4151](https://github.com/angular-ui/bootstrap/issues/4151))
* add multiple trigger support ([ca9196fa](https://github.com/angular-ui/bootstrap/commit/ca9196fa), closes [#3987](https://github.com/angular-ui/bootstrap/issues/3987), [#4077](https://github.com/angular-ui/bootstrap/issues/4077))


#### Breaking Changes

* Allow the user to hit `esc` inside an element in a modal and not exit the modal if the event has been `defaultPrevented`

Closes #3551
Fixes #2544

([a05b9c1a](https://github.com/angular-ui/bootstrap/commit/a05b9c1a))
* Change validation key to `dateDisabled` to align better with Angular's convention

Closes #2773
Closes #4080

([5245ccad](https://github.com/angular-ui/bootstrap/commit/5245ccad))


<a name"0.13.2"></a>
### 0.13.2 (2015-08-02)

2 changes: 2 additions & 0 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
@@ -139,12 +139,14 @@ module.exports = function(grunt) {
},
jenkins: {
singleRun: true,
autoWatch: false,
colors: false,
reporters: ['dots', 'junit'],
browsers: ['Chrome', 'ChromeCanary', 'Firefox', 'Opera', '/Users/jenkins/bin/safari.sh']
},
travis: {
singleRun: true,
autoWatch: false,
reporters: ['dots'],
browsers: ['Firefox']
},
2 changes: 1 addition & 1 deletion karma.conf.js
View file
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ module.exports = function(config) {


// enable / disable watching file and executing tests whenever any file changes
autoWatch: false,
autoWatch: true,


// start these browsers
3 changes: 2 additions & 1 deletion misc/demo/assets/plunker.js
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ angular.module('plunker', [])
'<html ng-app="ui.bootstrap.demo">\n' +
' <head>\n' +
' <script src="//ajax.googleapis.com/ajax/libs/angularjs/'+ngVersion+'/angular.js"></script>\n' +
' <script src="//ajax.googleapis.com/ajax/libs/angularjs/'+ngVersion+'/angular-animate.js"></script>\n' +
' <script src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-'+version+'.js"></script>\n' +
' <script src="example.js"></script>\n' +
' <link href="//netdna.bootstrapcdn.com/bootstrap/'+bsVersion+'/css/bootstrap.min.css" rel="stylesheet">\n' +
@@ -27,7 +28,7 @@ angular.module('plunker', [])
};

var scriptContent = function(content) {
return "angular.module('ui.bootstrap.demo', ['ui.bootstrap']);" + "\n" + content;
return "angular.module('ui.bootstrap.demo', ['ngAnimate', 'ui.bootstrap']);" + "\n" + content;
};

addField('description', 'http://angular-ui.github.io/bootstrap/');
76 changes: 40 additions & 36 deletions misc/demo/index.html
View file
Original file line number Diff line number Diff line change
@@ -24,41 +24,39 @@
<link rel="author" href="https://github.com/angular-ui/bootstrap/graphs/contributors">
</head>
<body class="ng-cloak" ng-controller="MainCtrl">
<header class="navbar navbar-default navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-3" ng-click="isCollapsed = !isCollapsed">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand visible-xs" href="#">UI Bootstrap</a>
</div>
<nav class="hidden-xs">
<ul class="nav navbar-nav">
<a href="#top" role="button" class="navbar-brand">
UI Bootstrap
</a>
<li class="dropdown" dropdown>
<a role="button" class="dropdown-toggle" dropdown-toggle>
Directives <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<% demoModules.forEach(function(module) { %><li><a href="#<%= module.name %>"><%= module.displayName %></a></li><% }); %>
</ul>
</li>
<li><a href="#getting_started">Getting started</a></li>
</ul>
</nav>
<nav class="visible-xs" collapse="!isCollapsed">
<ul class="nav navbar-nav">
<li><a href="#getting_started" ng-click="isCollapsed = !isCollapsed">Getting started</a></li>
<li><a href="#directives_small" ng-click="isCollapsed = !isCollapsed">Directives</a></li>
</ul>
</nav>
<header class="navbar navbar-default navbar-fixed-top navbar-inner">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-3" ng-click="isCollapsed = !isCollapsed">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand visible-xs" href="#">UI Bootstrap</a>
</div>
<nav class="hidden-xs">
<ul class="nav navbar-nav">
<a href="#top" role="button" class="navbar-brand">
UI Bootstrap
</a>
<li class="dropdown" dropdown>
<a role="button" class="dropdown-toggle" dropdown-toggle>
Directives <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<% demoModules.forEach(function(module) { %><li><a href="#<%= module.name %>"><%= module.displayName %></a></li><% }); %>
</ul>
</li>
<li><a href="#getting_started">Getting started</a></li>
</ul>
</nav>
<nav class="visible-xs" collapse="!isCollapsed">
<ul class="nav navbar-nav">
<li><a href="#getting_started" ng-click="isCollapsed = !isCollapsed">Getting started</a></li>
<li><a href="#directives_small" ng-click="isCollapsed = !isCollapsed">Directives</a></li>
</ul>
</nav>
</div>
</header>
<div class="header-placeholder"></div>
@@ -156,7 +154,7 @@ <h3>Files to download</h3>
<p>
Build files for all directives are distributed in several flavours: minified for production usage, un-minified
for development, with or without templates. All the options are described and can be
<a href="https://github.com/angular-ui/bootstrap/tree/gh-pages">downloaded from here</a>.
<a href="https://github.com/angular-ui/bootstrap/tree/gh-pages">downloaded from here</a>. It should be noted that the <code>-tpls</code> files contain the templates bundled in JavaScript, while the regular version does not contain the bundled templates. For more information, check out the FAQ <a href="https://github.com/angular-ui/bootstrap/wiki/FAQ#full-explanation">here</a> and the README <a href="https://github.com/angular-ui/bootstrap/tree/gh-pages#build-files">here</a>.
</p>
<p>Alternativelly, if you are only interested in a subset of directives, you can
<a ng-click="showBuildModal()">create your own build</a>.
@@ -175,6 +173,12 @@ <h3>CSS</h3>
</p>
<h3>FAQ</h3>
<p>Please check <a href="https://github.com/angular-ui/bootstrap/wiki/FAQ" target="_blank">our FAQ section</a> for common problems / solutions.</p>
<h3>Reading the documentation</h3>
<p>
Each of the directives provided in <code>ui-bootstrap</code> have documentation and interactive Plunker examples. There is also a list of settings which outline the default
values of settings, and whether they are readonly. In addition to this, some settings have an eye icon next to them like this <i class="glyphicon glyphicon-eye-open"></i>. The
eye means that the setting has an Angular <a href="https://docs.angularjs.org/api/ng/type/$rootScope.Scope#$watch" title="Angular $watch" target="_blank">$watch</a> listener applied to it.
</p>
</section>
<% demoModules.forEach(function(module) { %>
<section id="<%= module.name %>">
@@ -195,7 +199,7 @@ <h1><%= module.displayName %><small>
<div class="row code">
<div class="col-md-12" ng-controller="PlunkerCtrl">
<div class="pull-right">
<button class="btn btn-info" id="plunk-btn" ng-click="edit('<%= ngversion%>', '<%= bsversion %>', '<%= pkg.version%>', '<%= module.name %>')"><i class="glyphicon glyphicon-edit"></i> Edit in plunker</button>
<button type="button" class="btn btn-info plunk-btn" ng-click="edit('<%= ngversion%>', '<%= bsversion %>', '<%= pkg.version%>', '<%= module.name %>')"><i class="glyphicon glyphicon-edit"></i> Edit in plunker</button>
</div>
<tabset>
<tab heading="Markup">
21 changes: 12 additions & 9 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"author": "https://github.com/angular-ui/bootstrap/graphs/contributors",
"name": "angular-ui-bootstrap",
"version": "0.13.2",
"version": "0.13.3",
"homepage": "http://angular-ui.github.io/bootstrap/",
"dependencies": {},
"scripts":{
"test": "grunt"
},
"repository": {
"type": "git",
"url": "https://github.com/angular-ui/bootstrap.git"
@@ -15,21 +18,21 @@
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-copy": "^0.8.0",
"grunt-contrib-jshint": "^0.11.1",
"grunt-contrib-uglify": "^0.8.0",
"grunt-contrib-uglify": "^0.9.1",
"grunt-contrib-watch": "^0.6.1",
"grunt-conventional-changelog": "^1.1.0",
"grunt-conventional-changelog": "^3.0.0",
"grunt-ddescribe-iit": "0.0.6",
"grunt-html2js": "^0.3.0",
"grunt-karma": "^0.10.1",
"grunt-karma": "^0.12.0",
"jasmine-core": "^2.2.0",
"karma": "^0.12.31",
"karma-chrome-launcher": "^0.1.7",
"karma-coverage": "^0.2.7",
"karma": "^0.13.3",
"karma-chrome-launcher": "^0.2.0",
"karma-coverage": "^0.4.2",
"karma-firefox-launcher": "^0.1.4",
"karma-jasmine": "^0.3.5",
"node-markdown": "0.1.1",
"semver": "^4.3.3",
"shelljs": "^0.4.0"
"semver": "^5.0.1",
"shelljs": "^0.5.1"
},
"license": "MIT"
}
13 changes: 9 additions & 4 deletions src/accordion/accordion.js
View file
Original file line number Diff line number Diff line change
@@ -45,11 +45,14 @@ angular.module('ui.bootstrap.accordion', ['ui.bootstrap.collapse'])
// and adds an accordion CSS class to itself element.
.directive('accordion', function () {
return {
restrict:'EA',
controller:'AccordionController',
restrict: 'EA',
controller: 'AccordionController',
controllerAs: 'accordion',
transclude: true,
replace: false,
templateUrl: 'template/accordion/accordion.html'
templateUrl: function(element, attrs) {
return attrs.templateUrl || 'template/accordion/accordion.html';
}
};
})

@@ -60,7 +63,9 @@ angular.module('ui.bootstrap.accordion', ['ui.bootstrap.collapse'])
restrict:'EA',
transclude:true, // It transcludes the contents of the directive into the template
replace: true, // The element containing the directive will be replaced with the template
templateUrl:'template/accordion/accordion-group.html',
templateUrl: function(element, attrs) {
return attrs.templateUrl || 'template/accordion/accordion-group.html';
},
scope: {
heading: '@', // Interpolate the heading attribute onto this scope
isOpen: '=?',
Loading