Merge branch 't/9645'

ckeditor · Nov 16, 2012 · 52e9232 · 52e9232
2 parents 6914eb6 + 185334c
commit 52e9232
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/plugins/htmlwriter/samples/outputforflash.html b/plugins/htmlwriter/samples/outputforflash.html
@@ -66,6 +66,11 @@ <h1 class="samples">
 							'\n\nPlease load the sample from a web server instead.' );
 
 					var editor = CKEDITOR.replace( 'editor1', {
+						/*
+						 * Ensure that htmlwriter plugin, which is required for this sample, is loaded.
+						 */
+						extraPlugins: 'htmlwriter',
+
 						height: 290,
 						width: '100%',
 						toolbar: [

diff --git a/plugins/htmlwriter/samples/outputhtml.html b/plugins/htmlwriter/samples/outputhtml.html
@@ -57,6 +57,11 @@ <h1 class="samples">
 			<script>
 
 				CKEDITOR.replace( 'editor1', {
+					/*
+					 * Ensure that htmlwriter plugin, which is required for this sample, is loaded.
+					 */
+					extraPlugins: 'htmlwriter',
+
 					/*
 					 * Style sheet for the contents
 					 */

diff --git a/plugins/magicline/samples/magicline.html b/plugins/magicline/samples/magicline.html
@@ -103,7 +103,9 @@ <h1 class="samples">
 			// <textarea>, or inside a <head><script> in a
 			// window.onload event handler.
 
-			CKEDITOR.replace( 'editor1' );
+			CKEDITOR.replace( 'editor1', {
+				extraPlugins: 'magicline' // Ensure that magicline plugin, which is required for this sample, is loaded.
+			} );
 
 		</script>
 	</div>
@@ -182,7 +184,8 @@ <h1 class="samples">
 			// window.onload event handler.
 
 			CKEDITOR.replace( 'editor2', {
-				magicline_color: 'blue' // Blue line
+				extraPlugins: 'magicline',	// Ensure that magicline plugin, which is required for this sample, is loaded.
+				magicline_color: 'blue'		// Blue line
 			});
 
 		</script>