Merge pull request #14 from SU-SWS/SITES-833

SITES-833: Update wysiwyg feature to support > 2.5 of WYSIWYG
SU-SWS · Sep 5, 2018 · 06d253d · 06d253d
2 parents 3dccda2 + 131f4b7
commit 06d253d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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,
@@ -30,41 +25,36 @@ 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,
-        ),
       ),
-      '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' => 1,
       'css_setting' => 'easy',
+      'css_theme' => 'stanford_framework',
       '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 +93,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
@@ -4,12 +4,11 @@ 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
@@ -23,3 +22,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