From 67fafffbe8a3648d3bf0d53601e9f2226c3675b4 Mon Sep 17 00:00:00 2001 From: Shea McKinney Date: Tue, 4 Sep 2018 13:52:41 -0700 Subject: [PATCH 1/3] fixup! wip. --- composer.json | 3 +- stanford_wysiwyg.features.filter.inc | 3 ++ stanford_wysiwyg.features.wysiwyg.inc | 42 +++++++++++++++------------ stanford_wysiwyg.info | 5 ++-- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index 67911c0..831ed78 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,7 @@ "license": "GPL-2.0+", "minimum-stability": "dev", "require": { - "composer/installers": "^1.2" + "composer/installers": "^1.2", + "drupal/wysiwyg": "~2.5" } } diff --git a/stanford_wysiwyg.features.filter.inc b/stanford_wysiwyg.features.filter.inc index 7e3f27d..046cc8d 100644 --- a/stanford_wysiwyg.features.filter.inc +++ b/stanford_wysiwyg.features.filter.inc @@ -236,12 +236,15 @@ div,p,table,ul,ol,blockquote,pre,span,abbr,i,br,cite,code,em,h2,h3,h4,h5,h6,hr,l 166 => 'clear-both', 168 => 'clearfix', ), + 'rule_bypass_valid_classes' => 0, 'rule_valid_ids' => array( 0 => 'prefix-*', ), + 'rule_bypass_valid_ids' => 0, 'rule_style_urls' => array( 0 => '/*', ), + 'rule_bypass_style_urls' => 0, ), ), 'pathologic' => array( diff --git a/stanford_wysiwyg.features.wysiwyg.inc b/stanford_wysiwyg.features.wysiwyg.inc index 0d2f17e..f5528ab 100644 --- a/stanford_wysiwyg.features.wysiwyg.inc +++ b/stanford_wysiwyg.features.wysiwyg.inc @@ -10,16 +10,11 @@ function stanford_wysiwyg_wysiwyg_default_profiles() { $profiles = array(); - // Exported profile: content_editor_text_format + // Exported profile: content_editor_text_format. $profiles['content_editor_text_format'] = array( 'format' => 'content_editor_text_format', 'editor' => 'ckeditor', 'settings' => array( - 'default' => 1, - 'user_choose' => 0, - 'show_toggle' => 1, - 'theme' => 'advanced', - 'language' => 'en', 'buttons' => array( 'default' => array( 'Bold' => 1, @@ -51,20 +46,16 @@ function stanford_wysiwyg_wysiwyg_default_profiles() { 'break' => 1, ), ), - 'toolbar_loc' => 'top', - 'toolbar_align' => 'left', - 'path_loc' => 'bottom', - 'resizing' => 1, - 'verify_html' => 1, - 'preformatted' => 0, - 'convert_fonts_to_spans' => 1, - 'remove_linebreaks' => 1, - 'apply_source_formatting' => 1, - 'paste_auto_cleanup_on_paste' => 1, - 'block_formats' => 'p,h2,h3,h4,h5,h6,pre', + 'theme' => 'advanced', + 'language' => 'en', + 'toolbarLocation' => 'top', + 'resize_enabled' => 1, + 'default_toolbar_grouping' => 0, + 'simple_source_formatting' => 0, 'css_setting' => 'easy', + 'css_theme' => 'seven', 'css_path' => '', - 'css_classes' => 'Abbreviation for All-Caps=abbr.initialism + 'stylesSet' => 'Abbreviation for All-Caps=abbr.initialism Button Link=a.button Edit Link=a.edit-link More Link=a.more-link @@ -103,8 +94,21 @@ Error Alert=div.alert-error Success Alert=div.alert-success Informational Alert=div.alert-info Well=div.well', + 'block_formats' => 'p,h2,h3,h4,h5,h6,pre', + 'forcePasteAsPlainText' => 0, + 'pasteFromWordNumberedHeadingToList' => 0, + 'pasteFromWordPromptCleanup' => 0, + 'pasteFromWordRemoveFontStyles' => 1, + 'pasteFromWordRemoveStyles' => 1, + ), + 'preferences' => array( + 'default' => 1, + 'user_choose' => 0, + 'show_toggle' => 1, + 'add_to_summaries' => 0, + 'version' => '3.6.6.1.7696', ), - 'metatags' => array(), + 'name' => 'formatcontent_editor_text_format', 'rdf_mapping' => array(), ); diff --git a/stanford_wysiwyg.info b/stanford_wysiwyg.info index 76874cf..6586282 100644 --- a/stanford_wysiwyg.info +++ b/stanford_wysiwyg.info @@ -4,16 +4,14 @@ core = 7.x package = Stanford version = 7.x-2.6-dev project = stanford_wysiwyg -project status url = https://github.com/SU-SWS/stanford_wysiwyg dependencies[] = better_formats dependencies[] = features dependencies[] = pathologic dependencies[] = stanford_easy_wysiwyg_css -dependencies[] = wysiwyg (>=2.2) +dependencies[] = wysiwyg (>=2.5) dependencies[] = wysiwyg_filter features[features_api][] = api:2 features[filter][] = content_editor_text_format -features[wysiwyg][] = content_editor_text_format features[user_permission][] = administer filters features[user_permission][] = show format selection for node features[user_permission][] = show format selection for taxonomy_term @@ -23,3 +21,4 @@ features[user_permission][] = show more format tips link features[user_permission][] = use text format content_editor_text_format features[user_permission][] = use text format filtered_html features[user_permission][] = use text format full_html +project status url = https://github.com/SU-SWS/stanford_wysiwyg From fd330d66f2cd05786a4893166c82ba79ba65a6f4 Mon Sep 17 00:00:00 2001 From: Shea McKinney Date: Tue, 4 Sep 2018 14:06:52 -0700 Subject: [PATCH 2/3] fixup! wip. --- stanford_wysiwyg.features.wysiwyg.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/stanford_wysiwyg.features.wysiwyg.inc b/stanford_wysiwyg.features.wysiwyg.inc index f5528ab..df7bccd 100644 --- a/stanford_wysiwyg.features.wysiwyg.inc +++ b/stanford_wysiwyg.features.wysiwyg.inc @@ -25,35 +25,34 @@ function stanford_wysiwyg_wysiwyg_default_profiles() { 'Indent' => 1, 'Undo' => 1, 'Redo' => 1, - 'Link' => 1, - 'Unlink' => 1, 'Image' => 1, 'Superscript' => 1, 'Subscript' => 1, 'Blockquote' => 1, + 'Link' => 1, + 'Unlink' => 1, + 'Anchor' => 1, 'HorizontalRule' => 1, 'Cut' => 1, 'Copy' => 1, 'PasteFromWord' => 1, 'RemoveFormat' => 1, + 'SpecialChar' => 1, 'Format' => 1, 'Styles' => 1, 'Table' => 1, 'CreateDiv' => 1, 'SpellChecker' => 1, ), - 'drupal' => array( - 'break' => 1, - ), ), 'theme' => 'advanced', 'language' => 'en', 'toolbarLocation' => 'top', 'resize_enabled' => 1, 'default_toolbar_grouping' => 0, - 'simple_source_formatting' => 0, + 'simple_source_formatting' => 1, 'css_setting' => 'easy', - 'css_theme' => 'seven', + 'css_theme' => 'stanford_framework', 'css_path' => '', 'stylesSet' => 'Abbreviation for All-Caps=abbr.initialism Button Link=a.button From 131f4b7e72c9865adfc86bb9f5e75f9e431a7b03 Mon Sep 17 00:00:00 2001 From: Shea McKinney Date: Tue, 4 Sep 2018 14:07:45 -0700 Subject: [PATCH 3/3] fixup! wip. --- stanford_wysiwyg.info | 1 + 1 file changed, 1 insertion(+) diff --git a/stanford_wysiwyg.info b/stanford_wysiwyg.info index 6586282..5203599 100644 --- a/stanford_wysiwyg.info +++ b/stanford_wysiwyg.info @@ -12,6 +12,7 @@ dependencies[] = wysiwyg (>=2.5) dependencies[] = wysiwyg_filter features[features_api][] = api:2 features[filter][] = content_editor_text_format +features[wysiwyg][] = content_editor_text_format features[user_permission][] = administer filters features[user_permission][] = show format selection for node features[user_permission][] = show format selection for taxonomy_term