[HippoCMS-scm] [onehippo/ckeditor] cc58e6: CMS-10944 Disable hippopicker buttons when their m...

2018-01-04 Thread GitHub
  Branch: refs/heads/hippo/release/12.0
  Home:   https://github.com/onehippo/ckeditor
  Commit: cc58e68a27349b95b4415c63e72ae07c2ec2d175
  
https://github.com/onehippo/ckeditor/commit/cc58e68a27349b95b4415c63e72ae07c2ec2d175
  Author: Mathijs den Burger 
  Date:   2018-01-04 (Thu, 04 Jan 2018)

  Changed paths:
M plugins/hippopicker/plugin.js

  Log Message:
  ---
  CMS-10944 Disable hippopicker buttons when their markup is not allowed

The commands of the 'internal link' and 'image' buttons need the ACF
rules too, otherwise the buttons are not toggled properly within
sections of a widget.

The requiredContent rules for the 'internal link' and 'image' buttons
used exclamation marks, which removed both buttons when content from
either one was not allowed. For example, when the 'img' was not allowed,
the internal link buttons got removed too. Not using exclamation marks
fixed this.

(cherry picked from commit 7fddce25798b7b72a475d95955b1f3f4553751e6)


  Commit: 99e4f93a53c65564bb36634607bacebaf65c8405
  
https://github.com/onehippo/ckeditor/commit/99e4f93a53c65564bb36634607bacebaf65c8405
  Author: Michael Metternich 
  Date:   2018-01-04 (Thu, 04 Jan 2018)

  Changed paths:
M plugins/hippopicker/plugin.js

  Log Message:
  ---
  CMS-10944 Reintegrate bugfix/CMS-10944 into hippo/release/12.0


Compare: 
https://github.com/onehippo/ckeditor/compare/84e80d974c31...99e4f93a53c6___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn


[HippoCMS-scm] [onehippo/ckeditor] cc58e6: CMS-10944 Disable hippopicker buttons when their m...

2018-01-04 Thread GitHub
  Branch: refs/heads/bugfix/CMS-10944
  Home:   https://github.com/onehippo/ckeditor
  Commit: cc58e68a27349b95b4415c63e72ae07c2ec2d175
  
https://github.com/onehippo/ckeditor/commit/cc58e68a27349b95b4415c63e72ae07c2ec2d175
  Author: Mathijs den Burger 
  Date:   2018-01-04 (Thu, 04 Jan 2018)

  Changed paths:
M plugins/hippopicker/plugin.js

  Log Message:
  ---
  CMS-10944 Disable hippopicker buttons when their markup is not allowed

The commands of the 'internal link' and 'image' buttons need the ACF
rules too, otherwise the buttons are not toggled properly within
sections of a widget.

The requiredContent rules for the 'internal link' and 'image' buttons
used exclamation marks, which removed both buttons when content from
either one was not allowed. For example, when the 'img' was not allowed,
the internal link buttons got removed too. Not using exclamation marks
fixed this.

(cherry picked from commit 7fddce25798b7b72a475d95955b1f3f4553751e6)


___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn