8000 fix: Port forward #7070 - faster DOM update after editing by fsbraun · Pull Request #7787 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

fix: Port forward #7070 - faster DOM update after editing #7787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 4, 2024
Merged

fix: Port forward #7070 - faster DOM update after editing #7787

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a204f5
Fixed browser freezing on cms toolbar markup refresh after plugin edi…
nichoski Jun 8, 2021
49602da
Fix typos and accidentally deleted imports during the merge
fsbraun Jan 28, 2024
c2a8287
Update cms/static/cms/js/modules/cms.changeform.js
fsbraun Jan 28, 2024
bad5122
Merge branch 'develop-4' into fix/port-forward-7070
fsbraun Jan 28, 2024
767d97f
Merge branch 'develop-4' into fix/port-forward-7070
fsbraun Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix typos and accidentally deleted imports during the merge
  • Loading branch information
@fsbraun
fsbraun committed Jan 28, 2024
commit 49602dad2c69482e40a43f0792f815bec399ab34
2 changes: 1 addition & 1 deletion cms/static/cms/js/modules/cms.changeform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import $ from 'jquery';
import addSlugHandlers from './slug';

$(function() {
$(function() {
// set local variables
var title = $('#id_title');
var slug = $('#id_slug');
Expand Down
5 changes: 3 additions & 2 deletions cms/static/cms/js/modules/cms.toolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import Navigation from './cms.navigation';
import Sideframe from './cms.sideframe';
import Modal from './cms.modal';
import Plugin from './cms.plugins';
åimport { showLoader, hideLoader } from './loader';
import { filter, throttle, uniq } from 'lodash';
import { showLoader, hideLoader } from './loader';
import { Helpers, KEYS } from './cms.base';

var SECOND = 1000;
Expand Down Expand Up @@ -717,7 +718,7 @@ var Toolbar = new Class({
_refreshMarkup: function(newToolbar) {
const switcher = this.ui.toolbarSwitcher.detach();

$(this.ui.toolbar[0]).replaceWith(newToolbar[0]);
$(this.ui.toolbar).html(newToolbar.children());

$('.cms-toolbar-item-cms-mode-switcher').replaceWith(switcher);

Expand Down
0