Skip to content

Commit

Permalink
Merge branch 't/9604'
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Nov 13, 2012
2 parents 95b8f98 + e26a46d commit a13e7c5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions core/editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -378,14 +378,14 @@

if ( extraPlugins ) {
// Remove them first to avoid duplications.
var removeRegex = new RegExp( '(?:^|,)(?:' + extraPlugins.replace( /\s*,\s*/g, '|' ) + ')(?=,|$)', 'g' );
plugins = plugins.replace( removeRegex, '' );
var extraRegex = new RegExp( '(?:^|,)(?:' + extraPlugins.replace( /\s*,\s*/g, '|' ) + ')(?=,|$)', 'g' );
plugins = plugins.replace( extraRegex, '' );

plugins += ',' + extraPlugins;
}

if ( removePlugins ) {
removeRegex = new RegExp( '(?:^|,)(?:' + removePlugins.replace( /\s*,\s*/g, '|' ) + ')(?=,|$)', 'g' );
var removeRegex = new RegExp( '(?:^|,)(?:' + removePlugins.replace( /\s*,\s*/g, '|' ) + ')(?=,|$)', 'g' );
plugins = plugins.replace( removeRegex, '' );
}

Expand Down

0 comments on commit a13e7c5

Please sign in to comment.