Merge branch 't/9509'

ckeditor · Dec 7, 2012 · c65eab0 · c65eab0
2 parents d4c048f + 6f1d7ca
commit c65eab0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plugins/magicline/plugin.js b/plugins/magicline/plugin.js
@@ -36,7 +36,7 @@
 				holdDistance: 0 | triggerOffset * ( config.magicline_holdDistance || 0.5 ),
 				boxColor: config.magicline_color || '#ff0000',
 				rtl: config.contentsLangDirection == 'rtl',
-				triggers: config.magicline_everywhere || false ? CKEDITOR.dtd.$block : { table:1,hr:1,div:1,ul:1,ol:1,dl:1 }
+				triggers: config.magicline_everywhere ? CKEDITOR.dtd.$block : { table:1,hr:1,div:1,ul:1,ol:1,dl:1,form:1,blockquote:1 }
 			},
 			scrollTimeout, hideTimeout, checkMouseTimeoutPending, checkMouseTimeout, checkMouseTimer;