|
60 | 60 | }
|
61 | 61 |
|
62 | 62 | function checkDepends(cur_filter) {
|
| 63 | + var dep = false; //The result of the dependency test. |
| 64 | + |
63 | 65 | if (cur_filter.active) {
|
64 | 66 | cur_filter.dependsOn = "";
|
65 | 67 | return;
|
|
68 | 70 | for (var i = 0; i < $scope.model.filters.length; i++) {
|
69 | 71 | if ($scope.model.filters[i].dependsOn) {
|
70 | 72 | if ($scope.model.filters[i].active && !$scope.model.filters[i].dependsOn.localeCompare(cur_filter.name)) {
|
| 73 | + dep = true; |
| 74 | + break; |
| 75 | + } |
| 76 | + } |
| 77 | + } |
71 | 78 |
|
72 |
| - var instance = $uibModal.open({ |
73 |
| - templateUrl: 'src/view/warningModal.html', |
74 |
| - controller: 'warning', |
75 |
| - ariaLabelledBy: 'modal-title', |
76 |
| - ariaDescribedBy: 'modal-body', |
77 |
| - animation: true, |
78 |
| - size: 'sm', |
79 |
| - resolve: { |
80 |
| - filter: function () { |
81 |
| - return cur_filter; |
82 |
| - } |
83 |
| - } |
84 |
| - }); |
85 |
| - |
86 |
| - instance.result.then(function () { |
| 79 | + if (dep) { |
| 80 | + var instance = $uibModal.open({ |
| 81 | + templateUrl: 'src/view/warningModal.html', |
| 82 | + controller: 'warning', |
| 83 | + ariaLabelledBy: 'modal-title', |
| 84 | + ariaDescribedBy: 'modal-body', |
| 85 | + animation: true, |
| 86 | + size: 'sm', |
| 87 | + resolve: { |
| 88 | + filter: function () { |
| 89 | + return cur_filter; |
| 90 | + } |
| 91 | + } |
| 92 | + }); |
87 | 93 |
|
88 |
| - for (var i = 0; i < $scope.model.filters.length; i++) { |
89 |
| - if ($scope.model.filters[i].dependsOn === null) { |
90 |
| - $scope.model.filters[i].dependsOn = ""; |
91 |
| - } |
92 |
| - } |
93 |
| - }, function () { |
| 94 | + instance.result.then(function () { |
94 | 95 |
|
95 |
| - for (var i = 0; i < $scope.model.filters.length; i++) { |
96 |
| - if ($scope.model.filters[i].dependsOn === null) { |
97 |
| - $scope.model.filters[i].dependsOn = cur_filter.name; |
98 |
| - } |
99 |
| - } |
100 |
| - }); |
| 96 | + for (var i = 0; i < $scope.model.filters.length; i++) { |
| 97 | + if ($scope.model.filters[i].dependsOn === null) { |
| 98 | + $scope.model.filters[i].dependsOn = ""; |
| 99 | + } |
| 100 | + } |
| 101 | + }, function () { |
101 | 102 |
|
102 |
| - break; |
| 103 | + for (var i = 0; i < $scope.model.filters.length; i++) { |
| 104 | + if ($scope.model.filters[i].dependsOn === null) { |
| 105 | + $scope.model.filters[i].dependsOn = cur_filter.name; |
| 106 | + } |
103 | 107 | }
|
104 |
| - } |
| 108 | + }); |
105 | 109 | }
|
106 | 110 | }
|
107 | 111 |
|
|
0 commit comments