#877 attempt to fix potential NPE with toastr if its not been initial…

…ised by the time we create the angular service
hawtio · Dec 20, 2013 · d0400e4 · d0400e4
1 parent 7b49e23
commit d0400e4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/hawtio-web/src/main/webapp/app/core/js/corePlugin.ts b/hawtio-web/src/main/webapp/app/core/js/corePlugin.ts
@@ -284,7 +284,14 @@ angular.module(Core.pluginName, ['bootstrap', 'ngResource', 'ui', 'ui.bootstrap.
           }
         }).
         factory('toastr', () => {
-          return (<any>window).toastr;
+          var win: any = window;
+          var answer: any = win.toastr;
+          if (!answer) {
+            // lets avoid any NPEs
+            answer = {};
+            win.toaster = answer;
+          }
+          return answer;
         }).
         factory('xml2json', ($window) => {
           var jquery:any = $;