Merge branch 't/10599' into major

ckeditor · Jul 9, 2013 · 8ac6a22 · 8ac6a22
2 parents cce40c0 + a8af8b6
commit 8ac6a22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins/indentlist/plugin.js b/plugins/indentlist/plugin.js
@@ -30,7 +30,7 @@
 			function commandDefinition( editor, name ) {
 				globalHelpers.specificDefinition.apply( this, arguments );
 
-				this.allowedContent = { 'ol ul': true };
+				// Require ul OR ol list.
 				this.requiredContent = [ 'ul', 'ol' ];
 
 				// Indent and outdent lists with TAB/SHIFT+TAB key. Indenting can

diff --git a/plugins/list/plugin.js b/plugins/list/plugin.js
@@ -754,7 +754,7 @@
 		lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE%
 		icons: 'bulletedlist,bulletedlist-rtl,numberedlist,numberedlist-rtl', // %REMOVE_LINE_CORE%
 		hidpi: true, // %REMOVE_LINE_CORE%
-		requires: 'indent',
+		requires: 'indentlist',
 		init: function( editor ) {
 			if ( editor.blockless )
 				return;