Skip to content
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

Fix entwine+react in case they rely on the redux store #728

Merged
merged 1 commit into from
Jan 30, 2018
Merged

Fix entwine+react in case they rely on the redux store #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion client/dist/js/TinyMCE_ssembed.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/dist/js/TinyMCE_sslink-file.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/dist/js/TinyMCE_ssmedia.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/dist/js/bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/src/entwine/TinyMCE_ssembed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ const filter = 'div[data-shortcode="embed"]';
})();

jQuery.entwine('ss', ($) => {
$('#insert-embed-react__dialog-wrapper').entwine({
$('.js-injector-boot #insert-embed-react__dialog-wrapper').entwine({
Element: null,

Data: {},
Expand Down
2 changes: 1 addition & 1 deletion client/src/entwine/TinyMCE_sslink-file.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jQuery.entwine('ss', ($) => {
/**
* Assumes that $('.insert-link__dialog-wrapper').entwine({}); is defined for shared functions
*/
$(`#${modalId}`).entwine({
$(`.js-injector-boot #${modalId}`).entwine({
renderModal(show) {
const handleHide = () => this.close();
const handleInsert = (...args) => this.handleInsert(...args);
Expand Down
2 changes: 1 addition & 1 deletion client/src/entwine/TinyMCE_ssmedia.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jQuery.entwine('ss', ($) => {
onclick: (e) => e.preventDefault(),
});

$('#insert-media-react__dialog-wrapper').entwine({
$('.js-injector-boot #insert-media-react__dialog-wrapper').entwine({
Element: null,

Data: {},
Expand Down
2 changes: 1 addition & 1 deletion client/src/entwine/UploadField/UploadFieldEntwine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jQuery.entwine('ss', ($) => {
/**
* See boot/index.js for `.react-boot` bootstrap
*/
$('.js-react-boot input.entwine-uploadfield').entwine({
$('.js-injector-boot input.entwine-uploadfield').entwine({
getContainer() {
let container = this.siblings('.uploadfield-holder')[0];
if (!container) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"author": "SilverStripe Ltd",
"engines": {
"node": "^6.x"
"node": ">=6.x"
},
"scripts": {
"build": "yarn && yarn test && NODE_ENV=production webpack -p --bail --progress",
Expand Down