Merge branch 'MAGETWO-34564-JS-error-if-expand-modules-list' into PR_Branch

Author: eddielau

setup/pub/angular-sanitize/angular-sanitize.min.js

@@ -4,14 +4,15 @@
  */
 
 'use strict';
-angular.module('customize-your-store', ['ngStorage'])
+angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
     .controller('customizeYourStoreController', ['$scope', '$localStorage' , '$state', '$http', '$sce', function ($scope, $localStorage, $state, $http, $sce) {
         $scope.store = {
             timezone: 'America/Los_Angeles',
             currency: 'USD',
             language: 'en_US',
             useSampleData: false,
             loadedAllModules: false,
+            showModulesControl: false,
             selectAll: true,
             allModules: [],
             errorFlag : false,
@@ -51,6 +52,7 @@ angular.module('customize-your-store', ['ngStorage'])
         if (!$scope.store.loadedAllModules) {
             $http.get('index.php/modules').success(function (data) {
                 $state.loadedModules = data;
+                $scope.store.showModulesControl = true;
                 if (data.error) {
                     $scope.updateOnExpand($scope.store.advanced);
                     $scope.store.errorMessage = $sce.trustAsHtml(data.error);

setup/pub/magento/setup/customize-your-store.js

@@ -22,6 +22,7 @@
         ->appendFile('pub/angular-ng-storage/angular-ng-storage.min.js')
         ->appendFile('pub/angular-ui-router/angular-ui-router.min.js')
         ->appendFile('pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js')
+        ->appendFile('pub/angular-sanitize/angular-sanitize.min.js')
         ->appendFile('pub/magento/setup/app.js')
         ->appendFile('pub/magento/setup/main.js')
         ->appendFile('pub/magento/setup/landing.js')

setup/view/layout/layout.phtml

@@ -118,7 +118,7 @@
         </div>
     </fieldset>
 
-    <fieldset class="form-fieldset customize-your-store-advanced">
+    <fieldset class="form-fieldset customize-your-store-advanced" ng-show="store.showModulesControl">
         <legend
             class="form-legend-expand"
             ng-click="updateOnExpand(store.advanced)"