GUI -- Added enable() function to flash service, to allow topo view to disable f…

…lash messages while restoring state..

Change-Id: I1c904d0b69bf707ffa08b423ac5d4ecf7b0a7ff2

@@ -41,7 +41,8 @@
     // internal state
     // internal state
     var settings,
     var settings,
         timer = null,
         timer = null,
-        data = [];
+        data = [],
+        enabled;
 
 
     // DOM elements
     // DOM elements
     var flashDiv, svg;
     var flashDiv, svg;
@@ -123,6 +124,8 @@
     }
     }
 
 
     function flash(msg) {
     function flash(msg) {
+        if (!enabled) return;
+
         if (timer) {
         if (timer) {
             $timeout.cancel(timer);
             $timeout.cancel(timer);
         }
         }
@@ -136,6 +139,10 @@
         updateFlash();
         updateFlash();
     }
     }
 
 
+    function enable(b) {
+        enabled = !!b;
+    }
+
     angular.module('onosLayer')
     angular.module('onosLayer')
         .factory('FlashService', ['$log', '$timeout',
         .factory('FlashService', ['$log', '$timeout',
         function (_$log_, _$timeout_) {
         function (_$log_, _$timeout_) {
@@ -145,11 +152,13 @@
             function initFlash(opts) {
             function initFlash(opts) {
                 settings = angular.extend({}, defaultSettings, opts);
                 settings = angular.extend({}, defaultSettings, opts);
                 flashDiv = d3.select('#flash');
                 flashDiv = d3.select('#flash');
+                enabled = true;
             }
             }
 
 
             return {
             return {
                 initFlash: initFlash,
                 initFlash: initFlash,
-                flash: flash
+                flash: flash,
+                enable: enable
             };
             };
         }]);
         }]);
 
 

@@ -273,10 +273,12 @@
 
 
         $log.debug('TOPO---- Prefs State:', prefsState);
         $log.debug('TOPO---- Prefs State:', prefsState);
 
 
+        flash.enable(false);
         toggleInstances(prefsState.insts);
         toggleInstances(prefsState.insts);
         toggleSummary(prefsState.summary);
         toggleSummary(prefsState.summary);
         toggleDetails(prefsState.detail);
         toggleDetails(prefsState.detail);
         toggleSprites(prefsState.sprites);
         toggleSprites(prefsState.sprites);
+        flash.enable(true);
     }
     }
 
 
 
 
@@ -362,7 +364,9 @@
                 function (proj) {
                 function (proj) {
                     projection = proj;
                     projection = proj;
                     $log.debug('** We installed the projection: ', proj);
                     $log.debug('** We installed the projection: ', proj);
+                    flash.enable(false);
                     toggleMap(prefsState.bg);
                     toggleMap(prefsState.bg);
+                    flash.enable(true);
                 }
                 }
             );
             );
             spriteG = zoomLayer.append ('g').attr('id', 'topo-sprites');
             spriteG = zoomLayer.append ('g').attr('id', 'topo-sprites');

@@ -47,8 +47,8 @@ describe('factory: fw/layer/flash.js', function () {
 
 
     it('should define api functions', function () {
     it('should define api functions', function () {
         expect(fs.areFunctions(flash, [
         expect(fs.areFunctions(flash, [
-            'initFlash', 'flash'
-        ])).toBeTruthy();
+            'initFlash', 'flash', 'enable'
+        ])).toBe(true);
     });
     });
 
 
     it('should have no items to start', function () {
     it('should have no items to start', function () {