vanilla ckeditor-3.4.2

[ckeditor.git] / _source / plugins / liststyle / dialogs / liststyle.js

diff --git a/_source/plugins/liststyle/dialogs/liststyle.js b/_source/plugins/liststyle/dialogs/liststyle.js
index d14ebb5..aa8840b 100644 (file)
--- a/_source/plugins/liststyle/dialogs/liststyle.js
+++ b/_source/plugins/liststyle/dialogs/liststyle.js
@@ -12,7 +12,7 @@
                catch( e ) { return null; }\r
 \r
                range.shrink( CKEDITOR.SHRINK_TEXT );\r
-               return range.getCommonAncestor().getAscendant( listTag, true );\r
+               return range.getCommonAncestor().getAscendant( listTag, 1 );\r
        }\r
 \r
        var mapListStyle = {\r
@@ -28,10 +28,11 @@
 \r
        function listStyle( editor, startupPage )\r
        {\r
+               var lang = editor.lang.list;\r
                if ( startupPage == 'bulletedListStyle' )\r
                {\r
                        return {\r
-                               title : editor.lang.list.bulletedTitle,\r
+                               title : lang.bulletedTitle,\r
                                minWidth : 300,\r
                                minHeight : 50,\r
                                contents :\r
@@ -43,15 +44,15 @@
                                                [\r
                                                        {\r
                                                                type : 'select',\r
-                                                               label : editor.lang.list.type,\r
+                                                               label : lang.type,\r
                                                                id : 'type',\r
                                                                style : 'width: 150px; margin: auto;',\r
                                                                items :\r
                                                                [\r
-                                                                       [ editor.lang.list.notset, '' ],\r
-                                                                       [ editor.lang.list.circle, 'circle' ],\r
-                                                                       [ editor.lang.list.disc,  'disc' ],\r
-                                                                       [ editor.lang.list.square, 'square' ]\r
+                                                                       [ lang.notset, '' ],\r
+                                                                       [ lang.circle, 'circle' ],\r
+                                                                       [ lang.disc,  'disc' ],\r
+                                                                       [ lang.square, 'square' ]\r
                                                                ],\r
                                                                setup : function( element )\r
                                                                {\r
@@ -95,26 +96,26 @@
 \r
                        var listStyleOptions =\r
                        [\r
-                               [ editor.lang.list.notset, '' ],\r
-                               [ editor.lang.list.lowerRoman, 'lower-roman' ],\r
-                               [ editor.lang.list.upperRoman, 'upper-roman' ],\r
-                               [ editor.lang.list.lowerAlpha, 'lower-alpha' ],\r
-                               [ editor.lang.list.upperAlpha, 'upper-alpha' ],\r
-                               [ editor.lang.list.decimal, 'decimal' ]\r
+                               [ lang.notset, '' ],\r
+                               [ lang.lowerRoman, 'lower-roman' ],\r
+                               [ lang.upperRoman, 'upper-roman' ],\r
+                               [ lang.lowerAlpha, 'lower-alpha' ],\r
+                               [ lang.upperAlpha, 'upper-alpha' ],\r
+                               [ lang.decimal, 'decimal' ]\r
                        ];\r
 \r
                        if ( !CKEDITOR.env.ie || CKEDITOR.env.version > 7 )\r
                        {\r
                                listStyleOptions.concat( [\r
-                                       [ editor.lang.list.armenian, 'armenian' ],\r
-                                       [ editor.lang.list.decimalLeadingZero, 'decimal-leading-zero' ],\r
-                                       [ editor.lang.list.georgian, 'georgian' ],\r
-                                       [ editor.lang.list.lowerGreek, 'lower-greek' ]\r
+                                       [ lang.armenian, 'armenian' ],\r
+                                       [ lang.decimalLeadingZero, 'decimal-leading-zero' ],\r
+                                       [ lang.georgian, 'georgian' ],\r
+                                       [ lang.lowerGreek, 'lower-greek' ]\r
                                ]);\r
                        }\r
 \r
                        return {\r
-                               title : editor.lang.list.numberedTitle,\r
+                               title : lang.numberedTitle,\r
                                minWidth : 300,\r
                                minHeight : 50,\r
                                contents :\r
@@ -130,10 +131,10 @@
                                                                children :\r
                                                                [\r
                                                                        {\r
-                                                                               label : editor.lang.list.start,\r
+                                                                               label : lang.start,\r
                                                                                type : 'text',\r
                                                                                id : 'start',\r
-                                                                               validate : CKEDITOR.dialog.validate.integer( editor.lang.list.validateStartNumber ),\r
+                                                                               validate : CKEDITOR.dialog.validate.integer( lang.validateStartNumber ),\r
                                                                                setup : function( element )\r
                                                                                {\r
                                                                                        var value = element.getAttribute( 'start' ) || 1;\r
@@ -146,7 +147,7 @@
                                                                        },\r
                                                                        {\r
                                                                                type : 'select',\r
-                                                                               label : editor.lang.list.type,\r
+                                                                               label : lang.type,\r
                                                                                id : 'type',\r
                                                                                style : 'width: 100%;',\r
                                                                                items : listStyleOptions,\r