Merge pull request #19708 from J0WI/patch-1

[civicrm-core.git] / ang / crmApp.js

diff --git a/ang/crmApp.js b/ang/crmApp.js
index 0726a045040cd0221783c60dc431a9fea3089462..e3baceb971a6618ba84bcea245725811ffdbaba1 100644 (file)
--- a/ang/crmApp.js
+++ b/ang/crmApp.js
@@ -3,8 +3,24 @@
   // crmApp should not provide any significant services, and no other
   // modules should depend on it.
   var crmApp = angular.module('crmApp', CRM.angular.modules);
+
+  // dev/core#1818 use angular 1.5 default of # instead of 1.6+ default of #!
+  crmApp.config(['$locationProvider', function($locationProvider) {
+    $locationProvider.hashPrefix("");
+  }]);
+
   crmApp.config(['$routeProvider',
     function($routeProvider) {
+
+      if (CRM.crmApp.defaultRoute) {
+        $routeProvider.when('/', {
+          template: '<div></div>',
+          controller: function($location) {
+            $location.path(CRM.crmApp.defaultRoute);
+          }
+        });
+      }
+
       $routeProvider.otherwise({
         template: ts('Unknown path')
       });