From 88f4e6096be89c37ee45db9a5b918e920a4550c7 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Sun, 15 Mar 2020 12:43:59 -0400
Subject: [PATCH] dev/core#1637 and dev/core#1651 fix paths
---
civicrm/js/jquery/jquery.crmEditable.js | 2 +-
civicrm/js/view/crm.designer.js | 2 +-
civicrm/js/wysiwyg/crm.ckeditor.js | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/civicrm/js/jquery/jquery.crmEditable.js b/civicrm/js/jquery/jquery.crmEditable.js
index b68b27f0a2..cfbdb446a4 100644
--- a/civicrm/js/jquery/jquery.crmEditable.js
+++ b/civicrm/js/jquery/jquery.crmEditable.js
@@ -168,7 +168,7 @@
});
}
- CRM.loadScript(CRM.config.packagesBase + 'jquery/plugins/jquery.jeditable.min.js').done(function() {
+ CRM.loadScript(CRM.config.packagesBase.replace(/\/+$/, '') + '/jquery/plugins/jquery.jeditable.min.js').done(function() {
$i.editable(callback, settings);
});
diff --git a/civicrm/js/view/crm.designer.js b/civicrm/js/view/crm.designer.js
index 9d43b92bf0..ec3ae53c4f 100644
--- a/civicrm/js/view/crm.designer.js
+++ b/civicrm/js/view/crm.designer.js
@@ -370,7 +370,7 @@
"theme": 'classic',
"dots": false,
"icons": false,
- "url": CRM.config.packagesBase + 'jquery/plugins/jstree/themes/classic/style.css'
+ "url": CRM.config.packagesBase.replace(/\/+$/, '') + '/jquery/plugins/jstree/themes/classic/style.css'
},
'plugins': ['themes', 'json_data', 'ui', 'search']
}).bind('loaded.jstree', function () {
diff --git a/civicrm/js/wysiwyg/crm.ckeditor.js b/civicrm/js/wysiwyg/crm.ckeditor.js
index 59bf880df9..b970da4568 100644
--- a/civicrm/js/wysiwyg/crm.ckeditor.js
+++ b/civicrm/js/wysiwyg/crm.ckeditor.js
@@ -54,8 +54,8 @@
function initialize() {
var
- browseUrl = CRM.config.packagesBase + "kcfinder/browse.php?cms=civicrm",
- uploadUrl = CRM.config.packagesBase + "kcfinder/upload.php?cms=civicrm&format=json",
+ browseUrl = CRM.config.packagesBase.replace(/\/+$/, '') + "/kcfinder/browse.php?cms=civicrm",
+ uploadUrl = CRM.config.packagesBase.replace(/\/+$/, '') + "/kcfinder/upload.php?cms=civicrm&format=json",
preset = $(item).data('preset') || 'default',
// This variable is always an array but a legacy extension could be setting it as a string.
customConfig = (typeof CRM.config.CKEditorCustomConfig === 'string') ? CRM.config.CKEditorCustomConfig :
--
GitLab