Changeset 41992

Timestamp:

10/24/2017 04:34:12 PM (8 years ago)

Author:

westonruter

Message:

Code Editor: Define default gutters and toggle lint markers based on changes to lint option.

Explicitly define gutters in base defaultSettings to improve merges of multiple calls to wp_enqueue_code_editor().

Props westonruter, georgestephanis for testing.
Amends [41974].
See #12423.

Location:

trunk/src

Files:

• wp-admin/js/code-editor.js (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)

trunk/src/wp-admin/js/code-editor.js

@@ -137 +137 @@
         // Keep lint options populated.
         editor.on( 'optionChange', function( cm, option ) {
-            var options;
+            var options, gutters, gutterName = 'CodeMirror-lint-markers';
             if ( 'lint' !== option ) {
                 return;
             }
+            gutters = editor.getOption( 'gutters' ) || [];
             options = editor.getOption( 'lint' );
             if ( true === options ) {
+                if ( ! _.contains( gutters, gutterName ) ) {
+                    editor.setOption( 'gutters', [ gutterName ].concat( gutters ) );
+                }
                 editor.setOption( 'lint', getLintOptions() ); // Expand to include linting options.
+            } else if ( ! options ) {
+                editor.setOption( 'gutters', _.without( gutters, gutterName ) );
             }
 

trunk/src/wp-includes/general-template.php

@@ -3158 +3158 @@
             ),
             'direction' => 'ltr', // Code is shown in LTR even in RTL languages.
+            'gutters' => array(),
         ),
         'csslint' => array(