Skip to content

Commit

Permalink
Renamed JS function loadCollapsibleContent to loadContent as it c…
Browse files Browse the repository at this point in the history
…an be used outside of `collapsible` scope.
  • Loading branch information
gbastien committed Nov 27, 2020
1 parent e5be1f9 commit 9c4a25f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Expand Up @@ -13,6 +13,9 @@ Changelog
- Fixed `content.richtextval` `outputMimeType` parameter to use
`text/x-html-safe` instead `text/html`.
[gbastien]
- Renamed JS function `loadCollapsibleContent` to `loadContent` as it can be
used outside of `collapsible` scope.
[gbastien]

0.35 (2020-11-18)
-----------------
Expand Down
16 changes: 9 additions & 7 deletions src/imio/helpers/browser/static/helpers.js
Expand Up @@ -68,11 +68,11 @@ function toggleDetails(id, toggle_parent_active=true, parent_tag=null, load_view
}
inner_content_tag = $('div.collapsible-inner-content', tag)[0];
if (load_view && !inner_content_tag.dataset.loaded) {
loadCollapsibleContent(tag, load_view, async=true, base_url)
loadContent(inner_content_tag, load_view, async=true, base_url, event_name="toggle_details_ajax_success")
}
}

function loadCollapsibleContent(tag, load_view, async=true, base_url=null) {
function loadContent(tag, load_view, async=true, base_url=null, event_name=null) {
// load content in the collapsible-inner-content div
var url = base_url || canonical_url();
url = url + '/' + load_view;
Expand All @@ -83,13 +83,15 @@ function loadCollapsibleContent(tag, load_view, async=true, base_url=null) {
cache: false,
async: async,
success: function(data) {
inner_content_tag.innerHTML = data;
inner_content_tag.dataset.loaded = true;
tag.innerHTML = data;
tag.dataset.loaded = true;
/* trigger event when ajax success, this let's register some JS
* initialization in returned HTML */
$.event.trigger({
type: "toggle_details_ajax_success",
tag: tag});
if (event_name) {
$.event.trigger({
type: event_name,
tag: tag});
}
},
error: function(jqXHR, textStatus, errorThrown) {
/*console.log(textStatus);*/
Expand Down

0 comments on commit 9c4a25f

Please sign in to comment.