Ticket #7746: 7746_5.patch
File 7746_5.patch, 8.7 KB (added by , 13 years ago) |
---|
-
_source/skins/office2003/skin.js
8 8 return { 9 9 editor : { css : [ 'editor.css' ] }, 10 10 dialog : { css : [ 'dialog.css' ] }, 11 separator : { canGroup: false }, 11 12 templates : { css : [ 'templates.css' ] }, 12 13 margins : [ 0, 14, 18, 14 ] 13 14 }; -
_source/plugins/toolbar/plugin.js
192 192 { 193 193 var toolbarId, 194 194 toolbarObj = 0, 195 toolbarName, 195 196 row = toolbar[ r ], 196 197 items; 197 198 … … 221 222 for ( var i = 0 ; i < items.length ; i++ ) 222 223 { 223 224 var item, 224 itemName = items[ i ]; 225 itemName = items[ i ], 226 canGroup; 225 227 226 if ( itemName == '-' ) 227 item = CKEDITOR.ui.separator; 228 else 229 item = editor.ui.create( itemName ); 228 item = editor.ui.create( itemName ); 230 229 231 230 if ( item ) 232 231 { 232 canGroup = item.canGroup !== false; 233 233 234 // Initialize the toolbar first, if needed. 234 235 if ( !toolbarObj ) 235 236 { … … 239 240 toolbarName = row.name && ( editor.lang.toolbarGroups[ row.name ] || row.name ); 240 241 241 242 // Output the toolbar opener. 242 output.push( '<span id="', toolbarId, '" class="cke_toolbar ', 243 ( item.canGroup ? 'cke_toolbar_grouped' : 'cke_toolbar_ungrouped' ), '"', 243 output.push( '<span id="', toolbarId, '" class="cke_toolbar"', 244 244 ( toolbarName ? ' aria-labelledby="'+ toolbarId + '_label"' : '' ), 245 245 ' role="toolbar">' ); 246 246 247 247 // If a toolbar name is available, send the voice label. 248 248 toolbarName && output.push( '<span id="', toolbarId, '_label" class="cke_voice_label">', toolbarName, '</span>' ); 249 249 … … 261 261 } 262 262 } 263 263 264 if ( item.canGroup )264 if ( canGroup ) 265 265 { 266 266 if ( !groupStarted ) 267 267 { … … 400 400 }); 401 401 402 402 editor.addCommand( 'toolbarFocus', commands.toolbarFocus ); 403 }404 });405 })();406 403 407 /** 408 * The UI element that renders a toolbar separator. 409 * @type Object 410 * @example 411 */ 412 CKEDITOR.ui.separator = 413 { 414 render : function( editor, output ) 415 { 416 output.push( '<span class="cke_separator" role="separator"></span>' ); 417 return {}; 418 } 419 }; 404 editor.ui.add( '-', CKEDITOR.UI_SEPARATOR, {} ); 405 editor.ui.addHandler( CKEDITOR.UI_SEPARATOR, 406 { 407 create: function() 408 { 409 return { 410 render : function( editor, output ) 411 { 412 output.push( '<span class="cke_separator" role="separator"></span>' ); 413 return {}; 414 } 415 } 416 } 417 }); 418 } 419 }); 420 })(); 420 421 422 CKEDITOR.UI_SEPARATOR = 'separator'; 423 421 424 /** 422 425 * The "theme space" to which rendering the toolbar. For the default theme, 423 426 * the recommended options are "top" and "bottom". -
_source/core/ui.js
71 71 72 72 var result = handler && handler.create.apply( this, item.args ); 73 73 74 // Allow overrides from skin ui definitions.. 75 item && ( result = CKEDITOR.tools.extend( result, this._.editor.skin[ item.type ], true ) ); 76 74 77 // Add reference inside command object. 75 78 if ( command ) 76 79 command.uiItems.push( result ); -
_source/plugins/richcombo/plugin.js
18 18 * @constant 19 19 * @example 20 20 */ 21 CKEDITOR.UI_RICHCOMBO = 3;21 CKEDITOR.UI_RICHCOMBO = 'richcombo'; 22 22 23 23 CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass( 24 24 { -
_source/skins/kama/skin.js
10 10 return { 11 11 editor : { css : [ 'editor.css' ] }, 12 12 dialog : { css : [ 'dialog.css' ] }, 13 richcombo : { canGroup: false }, 13 14 templates : { css : [ 'templates.css' ] }, 14 15 margins : [ 0, 0, 0, 0 ], 15 16 init : function( editor ) -
_source/skins/v2/richcombo.css
7 7 margin-right: 2px; 8 8 margin-top: 2px; 9 9 vertical-align: top; 10 float: left;11 10 } 12 11 13 12 .cke_skin_v2 .cke_browser_ie .cke_rcombo 14 13 { 15 #float: none;16 14 #display: inline; 17 15 } 18 16 19 .cke_skin_v2 .cke_rtl .cke_rcombo20 {21 float: right;22 }23 24 .cke_skin_v2 .cke_browser_ie .cke_rcombo25 {26 #float: none;27 }28 29 17 .cke_skin_v2 .cke_rcombopanel 30 18 { 31 19 border: 1px solid #316ac5; … … 58 46 59 47 .cke_skin_v2 .cke_rcombo .cke_label 60 48 { 61 display: inline-block;62 49 float: left; 63 64 line-height: 2 4px;50 line-height: 20px; 51 line-height: 22px\9; 65 52 height: 22px; 66 vertical-align: top;67 53 padding-left: 4px; 68 54 padding-right: 5px; 69 55 filter: alpha(opacity=70); /* IE */ -
_source/plugins/panel/plugin.js
16 16 * @constant 17 17 * @example 18 18 */ 19 CKEDITOR.UI_PANEL = 2;19 CKEDITOR.UI_PANEL = 'panel'; 20 20 21 21 CKEDITOR.ui.panel = function( document, definition ) 22 22 { -
_source/plugins/button/plugin.js
16 16 * @constant 17 17 * @example 18 18 */ 19 CKEDITOR.UI_BUTTON = 1;19 CKEDITOR.UI_BUTTON = 'button'; 20 20 21 21 /** 22 22 * Represents a button UI element. This class should not be called directly. To … … 96 96 97 97 CKEDITOR.ui.button.prototype = 98 98 { 99 canGroup : true,100 101 99 /** 102 100 * Renders the button. 103 101 * @param {CKEDITOR.editor} editor The editor instance which this button is -
_source/skins/v2/skin.js
8 8 return { 9 9 editor : { css : [ 'editor.css' ] }, 10 10 dialog : { css : [ 'dialog.css' ] }, 11 separator : { canGroup: false }, 11 12 templates : { css : [ 'templates.css' ] }, 12 13 margins : [ 0, 14, 18, 14 ] 13 14 }; -
_source/plugins/menubutton/plugin.js
17 17 * @constant 18 18 * @example 19 19 */ 20 CKEDITOR.UI_MENUBUTTON = 5;20 CKEDITOR.UI_MENUBUTTON = 'menubutton'; 21 21 22 22 (function() 23 23 { -
_source/skins/kama/toolbar.css
106 106 display: none; 107 107 } 108 108 109 .cke_skin_kama .cke_tool bar.cke_toolbar_grouped109 .cke_skin_kama .cke_toolgroup 110 110 { 111 111 -moz-border-radius:5px; 112 112 -webkit-border-radius: 5px; … … 122 122 display: inline; 123 123 } 124 124 125 .cke_skin_kama .cke_rtl .cke_tool bar.cke_toolbar_grouped125 .cke_skin_kama .cke_rtl .cke_toolgroup 126 126 { 127 127 float: right; 128 128 margin-right: 0; -
_source/skins/office2003/richcombo.css
7 7 margin-right: 2px; 8 8 margin-top: 2px; 9 9 vertical-align: top; 10 float: left;11 10 } 12 11 13 12 .cke_skin_office2003 .cke_browser_ie .cke_rcombo 14 13 { 15 #float: none;16 14 #display: inline; 17 15 } 18 16 19 .cke_skin_office2003 .cke_rtl .cke_rcombo20 {21 float: right;22 }23 24 .cke_skin_office2003 .cke_browser_ie .cke_rcombo25 {26 #float: none;27 }28 29 17 .cke_skin_office2003 .cke_rcombopanel 30 18 { 31 19 border: 1px solid #316ac5; -
_source/plugins/panelbutton/plugin.js
17 17 * @constant 18 18 * @example 19 19 */ 20 CKEDITOR.UI_PANELBUTTON = 4;20 CKEDITOR.UI_PANELBUTTON = 'panelbutton'; 21 21 22 22 (function() 23 23 {