Merge branch 'master' of github.com:angular-ui/bootstrap

Author: aroop

README.md

@@ -36,7 +36,7 @@ Are you interested in Angular 2? We are on our way! Check out [ng-bootstrap](htt
 Installation is easy as UI Bootstrap has minimal dependencies - only the AngularJS and Twitter Bootstrap's CSS are required.
 Note: Since version 0.13.0, UI Bootstrap depends on [ngAnimate](https://docs.angularjs.org/api/ngAnimate) for transitions and animations, such as the accordion, carousel, etc. Include `ngAnimate` in the module dependencies for your app in order to enable animation.
 
-Additionally, it is srongly recommended that for UI Bootstrap 0.13.3 and higher you use Angular 1.3.18 or higher due to animation fixes.
+Additionally, it is strongly recommended that for UI Bootstrap 0.13.3 and higher you use Angular 1.3.18 or higher due to animation fixes.
 
 #### Install with NPM
 

docs/css/style.css

@@ -76,7 +76,7 @@ function MainCtrl($scope, $http, $document, $uibModal, orderByFilter) {
   };
 }
 
-function SelectModulesCtrl($scope, $modalInstance, modules, buildFilesService) {
+function SelectModulesCtrl($scope, $uibModalInstance, modules, buildFilesService) {
   $scope.selectedModules = [];
   $scope.modules = modules;
 
@@ -89,11 +89,11 @@ function SelectModulesCtrl($scope, $modalInstance, modules, buildFilesService) {
   };
 
   $scope.downloadBuild = function () {
-    $modalInstance.close($scope.selectedModules);
+    $uibModalInstance.close($scope.selectedModules);
   };
 
   $scope.cancel = function () {
-    $modalInstance.dismiss();
+    $uibModalInstance.dismiss();
   };
 
   $scope.isOldBrowser = function () {
@@ -242,7 +242,7 @@ function SelectModulesCtrl($scope, $modalInstance, modules, buildFilesService) {
   };
 }
 
-function DownloadCtrl($scope, $modalInstance) {
+function DownloadCtrl($scope, $uibModalInstance) {
   $scope.options = {
     minified: true,
     tpls: true
@@ -265,7 +265,7 @@ function DownloadCtrl($scope, $modalInstance) {
   };
 
   $scope.cancel = function () {
-    $modalInstance.dismiss();
+    $uibModalInstance.dismiss();
   };
 }