Commit 17e6e6085452f8e88d017e9d1e16a45e94e343e1
Merge branch 'SettingBug8006' into Develop
Showing
1 changed file
with
10 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -672,7 +672,16 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
672 | 672 | //localStorage.setItem("globalModesty", $rootScope.globalSetting.modesty); |
673 | 673 | |
674 | 674 | //4. |
675 | - $rootScope.reloadChildController(); | |
675 | + //$rootScope.reloadChildController(); | |
676 | + | |
677 | + var len = $rootScope.openModules.length; | |
678 | + if (len > 0) { | |
679 | + $rootScope.reloadChildController(); | |
680 | + } | |
681 | + else | |
682 | + { | |
683 | + $('#modal-settings').modal('hide'); | |
684 | + } | |
676 | 685 | |
677 | 686 | }; |
678 | 687 | ... | ... |