Ticket #2885: 2885_7.patch

_source/lang/en.js

@@ -549 +549 @@
                 tag_div : 'Normal (DIV)'
         },
 
+        div :
+        {
+                title                           : 'Create Div Container',
+                toolbar                         : 'Create Div Container',
+                cssClassInputLabel      : 'Stylesheet Classes',
+                styleSelectLabel        : 'Style',
+                IdInputLabel            : 'Id',
+                languageCodeInputLabel  : ' Language Code',
+                inlineStyleInputLabel   : 'Inline Style',
+                advisoryTitleInputLabel : 'Advisory Title',
+                langDirLabel            : 'Language Direction',
+                langDirLTRLabel         : 'Left to Right (LTR)',
+                langDirRTLLabel         : 'Right to Left (RTL)',
+                edit                            : 'Edit Div Container',
+                remove                          : 'Remove Div Container'
+        },
+
         font :
         {
                 label : 'Font',

_source/plugins/menu/plugin.js

@@ -328 +328 @@
         'form,' +
         'tablecell,tablecellproperties,tablerow,tablecolumn,table,'+
         'anchor,link,image,flash,' +
-        'checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea';
+        'checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div';

_source/plugins/toolbar/plugin.js

@@ -277 +277 @@
         ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'],
         '/',
         ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
-        ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
+        ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
         ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
         ['Link','Unlink','Anchor'],     ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],
         '/',

_source/skins/office2003/icons.css

@@ -306 +306 @@
 {
         background-position: 0 -1040px;
 }
+
+.cke_skin_office2003 .cke_button_creatediv .cke_icon
+{
+        background-position: 0 -1168px;
+}
+
+.cke_skin_office2003 .cke_button_editdiv .cke_icon
+{
+        background-position: 0 -1184px;
+}
+
+.cke_skin_office2003 .cke_button_removediv .cke_icon
+{
+        background-position: 0 -1200px;
+}

_source/skins/v2/icons.css

@@ -306 +306 @@
 {
         background-position: 0 -1040px;
 }
+
+.cke_skin_v2 .cke_button_creatediv .cke_icon
+{
+        background-position: 0 -1168px;
+}
+
+.cke_skin_v2 .cke_button_editdiv .cke_icon
+{
+        background-position: 0 -1184px;
+}
+
+.cke_skin_v2 .cke_button_removediv .cke_icon
+{
+        background-position: 0 -1200px;
+}

_source/core/config.js

@@ -150 +150 @@
          * config.plugins = 'basicstyles,button,htmldataprocessor,toolbar,wysiwygarea';
          */
 
-        plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,contextmenu,elementspath,enterkey,entities,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,preview,print,removeformat,save,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
+        plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,contextmenu,div,elementspath,enterkey,entities,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,preview,print,removeformat,save,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
 
         /**
          * The editor tabindex value.

_source/core/dtd.js

@@ -66 +66 @@
                  */
                 $block : block,
 
+                /**
+                 * List of block limit elements.
+                 * @type Object
+                 * @example
+                 */
+                $blockLimit : { body:1,div:1,td:1,th:1,caption:1,form:1 },
+
                 $body : X({script:1}, block),
 
                 /**

_source/core/dom/elementpath.js

@@ -9 +9 @@
         var pathBlockElements = { address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,de:1 };
 
         // Elements that may be considered the "Block limit" in an element path.
-        var pathBlockLimitElements = { body:1,div:1,td:1,th:1,caption:1,form:1 };
+        var pathBlockLimitElements = CKEDITOR.dtd.$blockLimit;
 
         // Check if an element contains any block element.
         var checkHasBlock = function( element )

_source/core/dom/element.js

@@ -75 +75 @@
 
 CKEDITOR.dom.element.setMarker = function( database, element, name, value )
 {
-        var id = element.getCustomData( 'list_marker_id' ) ||
-                        ( element.setCustomData( 'list_marker_id', CKEDITOR.tools.getNextNumber() ).getCustomData( 'list_marker_id' ) ),
-                markerNames = element.getCustomData( 'list_marker_names' ) ||
-                        ( element.setCustomData( 'list_marker_names', {} ).getCustomData( 'list_marker_names' ) );
+        var id = element.getCustomData( 'marker_id' ) ||
+                        ( element.setCustomData( 'marker_id', CKEDITOR.tools.getNextNumber() ).getCustomData( 'marker_id' ) ),
+                markerNames = element.getCustomData( 'marker_names' ) ||
+                        ( element.setCustomData( 'marker_names', {} ).getCustomData( 'marker_names' ) );
         database[id] = element;
         markerNames[name] = 1;
 
@@ -93 +93 @@
 
 CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatabase )
 {
-        var names = element.getCustomData( 'list_marker_names' ),
-                id = element.getCustomData( 'list_marker_id' );
+        var names = element.getCustomData( 'marker_names' ),
+                id = element.getCustomData( 'marker_id' );
         for ( var i in names )
                 element.removeCustomData( i );
-        element.removeCustomData( 'list_marker_names' );
+        element.removeCustomData( 'marker_names' );
         if ( removeFromDatabase )
         {
-                element.removeCustomData( 'list_marker_id' );
+                element.removeCustomData( 'marker_id' );
                 delete database[id];
         }
 };
@@ -441 +441 @@
                 {
                         return new CKEDITOR.dom.nodeList( this.$.childNodes );
                 },
-
+                
                 /**
                  * Gets the current computed value of one of the element CSS style
                  * properties.