Procházet zdrojové kódy

Merge pull request #35 from cksource/t/34

Add pagebuilder before the includes pagebuilder.
Piotrek Koszuliński před 10 roky
rodič
revize
4c02bc3a30
2 změnil soubory, kde provedl 14 přidání a 2 odebrání
  1. 2 1
      bender.js
  2. 12 1
      dev/bender/plugins/ckeditor5/lib/index.js

+ 2 - 1
bender.js

@@ -32,7 +32,8 @@ var config = {
 			applications: [ 'ckeditor' ],
 			paths: [
 				'tests/**',
-				'node_modules/ckeditor5-*/tests/**'
+				'node_modules/ckeditor5-*/tests/**',
+				'!**/_*/**'
 			]
 		}
 	},

+ 12 - 1
dev/bender/plugins/ckeditor5/lib/index.js

@@ -21,7 +21,6 @@ module.exports = {
 		var bender = that;
 
 		bender.plugins.addFiles( files );
-		bender.plugins.addInclude( files );
 
 		bender.on( 'test:created', function( test ) {
 			var name = test.displayName;
@@ -31,5 +30,17 @@ module.exports = {
 
 			test.displayName = name;
 		} );
+
+		// Add this plugins' scripts before the includes pagebuilder (which handles bender-include directives), so
+		// the main tools file is loaded before tools included in the core or in the plugins.
+		this.pagebuilders.add( 'ckeditor5', build, this.pagebuilders.getPriority( 'includes' ) - 1 );
+
+		function build( data ) {
+			files.forEach( function( file ) {
+				data.addJS( path.join( '/plugins/', file ).split( path.sep ).join( '/' ) );
+			} );
+
+			return data;
+		}
 	}
 };