Unverified Commit d3296bb1 authored by Seamus Lee's avatar Seamus Lee Committed by GitHub

Merge pull request #16791 from totten/5.24-dot

(REF) #1637, #1651 - Restore format of packagesBase 
parents d0f8084b 605ee23e
......@@ -168,7 +168,7 @@
});
}
CRM.loadScript(CRM.config.packagesBase.replace(/\/+$/, '') + '/jquery/plugins/jquery.jeditable.min.js').done(function() {
CRM.loadScript(CRM.config.packagesBase + 'jquery/plugins/jquery.jeditable.min.js').done(function() {
$i.editable(callback, settings);
});
......
......@@ -370,7 +370,7 @@
"theme": 'classic',
"dots": false,
"icons": false,
"url": CRM.config.packagesBase.replace(/\/+$/, '') + '/jquery/plugins/jstree/themes/classic/style.css'
"url": CRM.config.packagesBase + 'jquery/plugins/jstree/themes/classic/style.css'
},
'plugins': ['themes', 'json_data', 'ui', 'search']
}).bind('loaded.jstree', function () {
......
......@@ -54,8 +54,8 @@
function initialize() {
var
browseUrl = CRM.config.packagesBase.replace(/\/+$/, '') + "/kcfinder/browse.php?cms=civicrm",
uploadUrl = CRM.config.packagesBase.replace(/\/+$/, '') + "/kcfinder/upload.php?cms=civicrm&format=json",
browseUrl = CRM.config.packagesBase + "kcfinder/browse.php?cms=civicrm",
uploadUrl = CRM.config.packagesBase + "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 :
......
......@@ -12,8 +12,10 @@
(function($) {ldelim}
// Config settings
CRM.config.userFramework = {$config->userFramework|@json_encode};
{* resourceBase: The URL of `civicrm-core` assets. Ends with "/". *}
CRM.config.resourceBase = {$config->userFrameworkResourceURL|@json_encode};
CRM.config.packagesBase = {capture assign=packagesBase}{crmResURL expr='[civicrm.packages]/.'}{/capture}{$packagesBase|@json_encode};
{* packageseBase: The URL of `civicrm-packages` assets. Ends with "/". *}
CRM.config.packagesBase = {capture assign=packagesBase}{crmResURL expr='[civicrm.packages]/'}{/capture}{$packagesBase|@json_encode};
CRM.config.lcMessages = {$config->lcMessages|@json_encode};
CRM.config.locale = {$locale|@json_encode};
CRM.config.cid = {$cid|@json_encode};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment