Merge pull request #24011 from demeritcowboy/composerlock

[civicrm-core.git] / js / crm.ajax.js

diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index 57ed34f9932a7d2f83a7c1573c10d20052dd7db5..82a8025a7942191cb0e322a29c506bb4eaf51bc9 100644 (file)
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -273,6 +273,10 @@
         } else {
           url = url.replace(/snippet=[^&]*/, 'snippet=' + snippetType);
         }
+        // See Civi\Angular\AngularLoader
+        if (snippetType === 'json' && CRM.angular) {
+          url += '&crmAngularModules=' + CRM.angular.modules.join();
+        }
       }
       return url;
     },
@@ -299,8 +303,10 @@
       });
     },
     refresh: function() {
-      var that = this;
-      var url = this._formatUrl(this.options.url, 'json');
+      var that = this,
+        hash = this.options.url.split('#')[1];
+        url = this._formatUrl(this.options.url, 'json');
+      $(this.element).data('urlHash', hash);
       if (this.options.crmForm) $('form', this.element).ajaxFormUnbind();
       if (this.options.block) this.element.block();
       this._ajax(url).then(function(data) {