Skip to content

Commit

Permalink
bug 1301067: don't close modals without confirmation when clicking ou…
Browse files Browse the repository at this point in the history
…tside of them (#193). r=bhearsum
  • Loading branch information
arn197 authored and bhearsum committed Dec 19, 2016
1 parent 22f6cac commit f379a80
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ui/app/js/controllers/permissions_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ function($scope, $routeParams, $location, $timeout, Permissions, Search, $modal)
var modalInstance = $modal.open({
templateUrl: 'permissions_modal.html',
controller: 'UserPermissionsCtrl',
backdrop: 'static',
// size: size, // can be lg or sm
resolve: {
user: function () {
Expand All @@ -99,6 +100,7 @@ function($scope, $routeParams, $location, $timeout, Permissions, Search, $modal)
var modalInstance = $modal.open({
templateUrl: 'user_modal.html',
controller: 'NewUserCtrl',
backdrop: 'static',
// size: 'sm',
resolve: {
users: function () {
Expand Down
7 changes: 7 additions & 0 deletions ui/app/js/controllers/releases_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ function($scope, $routeParams, $location, $timeout, Releases, Search, $modal) {
templateUrl: 'release_data_modal.html',
controller: 'ReleaseDataCtrl',
size: 'lg',
backdrop: 'static',
resolve: {
release: function () {
return release;
Expand All @@ -147,6 +148,7 @@ function($scope, $routeParams, $location, $timeout, Releases, Search, $modal) {
templateUrl: 'release_data_modal.html',
controller: 'ReleaseDataCtrl',
size: 'lg',
backdrop: 'static',
resolve: {
release: function () {
return release;
Expand All @@ -164,6 +166,7 @@ function($scope, $routeParams, $location, $timeout, Releases, Search, $modal) {
var modalInstance = $modal.open({
templateUrl: 'release_modal.html',
controller: 'ReleaseEditCtrl',
backdrop: 'static',
// size: size, // can be lg or sm
resolve: {
release: function () {
Expand All @@ -179,6 +182,7 @@ function($scope, $routeParams, $location, $timeout, Releases, Search, $modal) {
var modalInstance = $modal.open({
templateUrl: 'release_delete_modal.html',
controller: 'ReleaseDeleteCtrl',
backdrop: 'static',
// size: 'sm',
resolve: {
release: function () {
Expand All @@ -197,6 +201,7 @@ function($scope, $routeParams, $location, $timeout, Releases, Search, $modal) {
var modalInstance = $modal.open({
templateUrl: 'release_modal.html',
controller: 'NewReleaseCtrl',
backdrop: 'static',
// size: 'sm',
resolve: {
releases: function() {
Expand All @@ -212,6 +217,7 @@ function($scope, $routeParams, $location, $timeout, Releases, Search, $modal) {
var modalInstance = $modal.open({
templateUrl: 'release_revert_modal.html',
controller: 'ReleaseRevertCtrl',
backdrop: 'static',
// size: 'sm',
resolve: {
release: function () {
Expand All @@ -233,6 +239,7 @@ function($scope, $routeParams, $location, $timeout, Releases, Search, $modal) {
var modalInstance = $modal.open({
templateUrl: 'release_read_only_modal.html',
controller: 'ReleaseReadOnlyCtrl',
backdrop: 'static',
// size: 'sm',
resolve: {
release: function() {
Expand Down
4 changes: 4 additions & 0 deletions ui/app/js/controllers/rule_scheduled_changes_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
templateUrl: 'rule_scheduled_change_modal.html',
controller: 'NewRuleScheduledChangeCtrl',
size: 'lg',
backdrop: 'static',
resolve: {
scheduled_changes: function() {
return $scope.scheduled_changes;
Expand All @@ -102,6 +103,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
templateUrl: "rule_scheduled_change_modal.html",
controller: "EditRuleScheduledChangeCtrl",
size: 'lg',
backdrop: 'static',
resolve: {
sc: function() {
sc.when = new Date(sc.when);
Expand All @@ -115,6 +117,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
var modalInstance = $modal.open({
templateUrl: "rule_scheduled_change_delete_modal.html",
controller: "DeleteRuleScheduledChangeCtrl",
backdrop: 'static',
resolve: {
sc: function() {
return sc;
Expand All @@ -134,6 +137,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
templateUrl: 'release_data_modal.html',
controller: 'ReleaseDataCtrl',
size: 'lg',
backdrop: 'static',
resolve: {
release: function () {
return response;
Expand Down
7 changes: 7 additions & 0 deletions ui/app/js/controllers/rules_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
templateUrl: 'rule_modal.html',
controller: 'RuleEditCtrl',
size: 'lg', // can be lg or sm
backdrop: 'static',
resolve: {
// items: function () {
// return $scope.items;
Expand All @@ -171,6 +172,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
templateUrl: 'rule_scheduled_change_modal.html',
controller: 'NewRuleScheduledChangeCtrl',
size: 'lg',
backdrop: 'static',
resolve: {
scheduled_changes: function() {
return [];
Expand All @@ -187,6 +189,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
var modalInstance = $modal.open({
templateUrl: 'rule_delete_modal.html',
controller: 'RuleDeleteCtrl',
backdrop: 'static',
// size: 'sm',
resolve: {
rule: function () {
Expand All @@ -206,6 +209,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
templateUrl: 'rule_modal.html',
controller: 'NewRuleCtrl',
size: 'lg',
backdrop: 'static',
resolve: {
rules: function() {
return $scope.rules;
Expand Down Expand Up @@ -233,6 +237,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
templateUrl: 'rule_modal.html',
controller: 'NewRuleCtrl',
size: 'lg',
backdrop: 'static',
resolve: {
rules: function() {
return $scope.rules;
Expand All @@ -257,6 +262,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
var modalInstance = $modal.open({
templateUrl: 'rule_revert_modal.html',
controller: 'RuleRevertCtrl',
backdrop: 'static',
// size: 'sm',
resolve: {
revision: function () {
Expand All @@ -283,6 +289,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
templateUrl: 'release_data_modal.html',
controller: 'ReleaseDataCtrl',
size: 'lg',
backdrop: 'static',
resolve: {
release: function () {
return response;
Expand Down

0 comments on commit f379a80

Please sign in to comment.