From e7c93dd475adade0ac9ef7e6b4f723d34173bed9 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 10 Jan 2018 16:57:58 -0500
Subject: [PATCH] CRM-17352 - Use Backbone.noConflict

---
 CRM/UF/Page/ProfileEditor.php   | 1 +
 js/crm.backbone.js              | 4 ++--
 js/crm.designerapp.js           | 4 ++--
 js/view/crm.designer.js         | 4 ++--
 js/view/crm.profile-selector.js | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CRM/UF/Page/ProfileEditor.php b/CRM/UF/Page/ProfileEditor.php
index f6d22d45cc..3abe9dfd56 100644
--- a/CRM/UF/Page/ProfileEditor.php
+++ b/CRM/UF/Page/ProfileEditor.php
@@ -61,6 +61,7 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page {
       ->addScriptFile('civicrm', 'packages/backbone-forms/distribution/adapters/backbone.bootstrap-modal.min.js', 140, 'html-header', FALSE)
       ->addScriptFile('civicrm', 'packages/backbone-forms/distribution/editors/list.min.js', 140, 'html-header', FALSE)
       ->addStyleFile('civicrm', 'packages/backbone-forms/distribution/templates/default.css', 140, 'html-header')
+      ->addScript('CRM.BB = Backbone.noConflict();', 300, 'html-header')
       ->addScriptFile('civicrm', 'packages/jquery/plugins/jstree/jquery.jstree.js', 0, 'html-header', FALSE)
       ->addStyleFile('civicrm', 'packages/jquery/plugins/jstree/themes/default/style.css', 0, 'html-header')
       ->addStyleFile('civicrm', 'css/crm.designer.css', 140, 'html-header')
diff --git a/js/crm.backbone.js b/js/crm.backbone.js
index e384466213..c7960305fa 100644
--- a/js/crm.backbone.js
+++ b/js/crm.backbone.js
@@ -1,4 +1,4 @@
-(function($, _) {
+(function($, _, Backbone) {
   if (!CRM.Backbone) CRM.Backbone = {};
 
   /**
@@ -569,4 +569,4 @@
       model.trigger('error', model, resp, options);
     };
   };
-})(CRM.$, CRM._);
+})(CRM.$, CRM._, CRM.BB);
diff --git a/js/crm.designerapp.js b/js/crm.designerapp.js
index 840d98a8e9..fef007d231 100644
--- a/js/crm.designerapp.js
+++ b/js/crm.designerapp.js
@@ -1,4 +1,4 @@
-(function ($, _) {
+(function ($, _, Backbone) {
   $(function () {
     /**
      * FIXME we depend on this being a global singleton, mainly to facilitate vents
@@ -30,4 +30,4 @@
       });
     };
   });
-})(CRM.$, CRM._);
+})(CRM.$, CRM._, CRM.BB);
diff --git a/js/view/crm.designer.js b/js/view/crm.designer.js
index a92ac6d606..f41f6986da 100644
--- a/js/view/crm.designer.js
+++ b/js/view/crm.designer.js
@@ -1,4 +1,4 @@
-(function($, _) {
+(function($, _, Backbone) {
   if (!CRM.Designer) CRM.Designer = {};
 
   /**
@@ -875,4 +875,4 @@
     }
   });
 
-})(CRM.$, CRM._);
+})(CRM.$, CRM._, CRM.BB);
diff --git a/js/view/crm.profile-selector.js b/js/view/crm.profile-selector.js
index 5c55405a7e..257dfd226f 100644
--- a/js/view/crm.profile-selector.js
+++ b/js/view/crm.profile-selector.js
@@ -1,4 +1,4 @@
-(function($, _) {
+(function($, _, Backbone) {
   if (!CRM.ProfileSelector) CRM.ProfileSelector = {};
 
   CRM.ProfileSelector.Option = Backbone.Marionette.ItemView.extend({
@@ -185,4 +185,4 @@
       view.render();
     }
   });
-})(CRM.$, CRM._);
+})(CRM.$, CRM._, CRM.BB);
-- 
2.25.1