MUMUP-2606 Added version flag to theme

uPortal-Attic · Jul 26, 2016 · ac8159e · ac8159e
1 parent 1d36324
commit ac8159e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 32 deletions.
diff --git a/uw-frame-components/js/frame-config.js b/uw-frame-components/js/frame-config.js
@@ -2,7 +2,10 @@ define(['angular'], function(angular) {
 
     var config = angular.module('frame-config', []);
     config
-        .constant('THEMES', [
+        .constant('THEMES',
+        {"themeVersion": 1,
+         "themes":
+        [
           {
             "name" : "uw-madison",
             "crest" : "img/uw-madison-52.png",
@@ -363,7 +366,7 @@ define(['angular'], function(angular) {
               "warn" : "deep-orange"
             }
           }
-        ])
+        ]})
         .constant('FRAME_URLS', {
             'aboutFrame' : 'staticFeeds/about-frame.json'
         })

diff --git a/uw-frame-components/portal/main.js b/uw-frame-components/portal/main.js
@@ -85,8 +85,8 @@ define([
       $mdThemingProvider.generateThemesOnDemand(true);
 
       //theme config
-      for(var i = 0; i < THEMES.length; i++) {
-        var cur = THEMES[i];
+      for(var i = 0; i < THEMES.themes.length; i++) {
+        var cur = THEMES.themes[i];
         if(cur) {
           if(cur.materialTheme) {
             $mdThemingProvider.theme(cur.name);
@@ -164,14 +164,15 @@ define([
         if(!name) {
           name = $rootScope.portal.theme.name;
         }
+        $rootScope.portal.theme.themeVersion = THEMES.themeVersion;
         var mdTheme = $mdTheming.THEMES[name];
         if(mdTheme) {
           $mdTheming.generateTheme(name,null);
         }
       };
 
       var themeLoading = function(){
-        if($sessionStorage.portal && $sessionStorage.portal.theme) {
+        if($sessionStorage.portal && $sessionStorage.portal.theme && $sessionStorage.portal.theme.themeVersion === THEMES.themeVersion) {
           $rootScope.portal.theme = $sessionStorage.portal.theme;
           generateTheme();
           if(APP_FLAGS.debug) {
@@ -191,9 +192,9 @@ define([
               generateTheme();
             } else {
               if(APP_FLAGS.debug) {
-                console.error('something is wrong with setup, no default theme. Setting to THEMES[0].');
+                console.error('something is wrong with setup, no default theme. Setting to THEMES.themes[0].');
               }
-              $rootScope.portal.theme = THEMES[0];
+              $rootScope.portal.theme = THEMES.themes[0];
               generateTheme();
             }
           };
@@ -203,8 +204,8 @@ define([
             $http.get(SERVICE_LOC.groupURL, {cache : true}).then(function(result) {
               var groups = result.data.groups;
               //go through each theme and see if there in that group
-              for(var i = 0; i < THEMES.length; i++) {
-                var theme = THEMES[i];
+              for(var i = 0; i < THEMES.themes.length; i++) {
+                var theme = THEMES.themes[i];
                 var groupToTest = theme.group;
                 if('default'!==groupToTest) {//skip the default theme
                   var filterTest = filterFilter(groups, { name : groupToTest });
@@ -237,7 +238,7 @@ define([
           }
         } else {
           //themeindex is a number, go with that
-          $rootScope.portal.theme = THEMES[themeIndex]; //theme default
+          $rootScope.portal.theme = THEMES.themes[themeIndex]; //theme default
           generateTheme();
           loadingCompleteSequence();
         }

diff --git a/uw-frame-components/portal/main/controllers.js b/uw-frame-components/portal/main/controllers.js
@@ -24,7 +24,7 @@ define(['angular','require'], function(angular, require) {
       $scope.NAMES=NAMES;
       $scope.APP_FLAGS=APP_FLAGS;
       $scope.MISC_URLS=MISC_URLS;
-      $scope.THEMES = THEMES;
+      $scope.THEMES = THEMES.themes;
 
       if(NAMES.title) {
         $document[0].title=NAMES.title;

diff --git a/uw-frame-components/portal/main/services.js b/uw-frame-components/portal/main/services.js
@@ -41,19 +41,7 @@ define(['angular'], function(angular) {
 
   }]);
 
-  app.factory('campusThemeService', ['$sessionStorage', 'themeName', function($sessionStorage, themeName) {
-
-     var i = null;
-     for (i = 0; $sessionStorage.THEMES.length > i; i += 1) {
-         if (sessionStorage.THEMES[i].name === themeName) {
-             $sessionStorage.portal.theme = $sessionStorage.THEMES[i];
-             return THEMES[i];
-         }
-     }
-
-         return null;
-    }]);
-
+
   return app;
 
 });
diff --git a/uw-frame-components/portal/settings/controllers.js b/uw-frame-components/portal/settings/controllers.js
@@ -4,18 +4,14 @@ define(['angular'], function(angular) {
   var app = angular.module('portal.settings.controllers', []);
 
 
-  app.controller('PortalBetaSettingsController', [ '$sessionStorage', '$scope', 'APP_BETA_FEATURES', 'FRAME_BETA_FEATURES', 'themeService', function($sessionStorage, $scope, APP_BETA_FEATURES, FRAME_BETA_FEATURES, themeService) {
+      app.controller('PortalBetaSettingsController', [ '$sessionStorage', '$scope', '$mdTheming', 'THEMES', 'APP_BETA_FEATURES', 'FRAME_BETA_FEATURES', function($sessionStorage, $scope,$mdTheming, THEMES, APP_BETA_FEATURES, FRAME_BETA_FEATURES) {
 
     $scope.options = FRAME_BETA_FEATURES.concat(APP_BETA_FEATURES);
     $scope.$watch('portal.theme', function() {
-
-
-
-
-    /*$sessionStorage.portal.theme =   campusThemeService($sessionStorage, $scope.portal.theme.name); */
-
-      $mdTheming.generateTheme($sessionStorage.portal.theme.name,null);
       $sessionStorage.portal.theme = $scope.portal.theme;
+      $sessionStorage.portal.theme.themeVersion = THEMES.themeVersion;
+      $mdTheming.generateTheme($sessionStorage.portal.theme.name,null);
+
     });
   }]);