X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=inline;f=_source%2Fplugins%2Ftable%2Fdialogs%2Ftable.js;h=2fd2ff050dee1389257716d78d47da88f61df95b;hb=refs%2Ftags%2Fv3.6.2;hp=7b06606adcac387ce190ff5e5ac580fa075367d5;hpb=9873d66421922c7aef8be0f5d2ab51e547b19e66;p=ckeditor.git diff --git a/_source/plugins/table/dialogs/table.js b/_source/plugins/table/dialogs/table.js index 7b06606..2fd2ff0 100644 --- a/_source/plugins/table/dialogs/table.js +++ b/_source/plugins/table/dialogs/table.js @@ -1,12 +1,11 @@ /* -Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ (function() { - var widthPattern = /^(\d+(?:\.\d+)?)(px|%)$/, - heightPattern = /^(\d+(?:\.\d+)?)px$/; + var defaultToPixel = CKEDITOR.tools.cssLength; var commitValue = function( data ) { @@ -16,6 +15,24 @@ For licensing, see LICENSE.html or http://ckeditor.com/license data.info[id] = this.getValue(); }; + function tableColumns( table ) + { + var cols = 0, maxCols = 0; + for ( var i = 0, row, rows = table.$.rows.length; i < rows; i++ ) + { + row = table.$.rows[ i ], cols = 0; + for ( var j = 0, cell, cells = row.cells.length; j < cells; j++ ) + { + cell = row.cells[ j ]; + cols += cell.colSpan; + } + + cols > maxCols && ( maxCols = cols ); + } + + return maxCols; + } + function tableDialog( editor, command ) { var makeElement = function( name ) @@ -42,24 +59,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { // Synchronize width value. var width = this.getStyle( 'width', '' ), - txtWidth = dialog.getContentElement( 'info', 'txtWidth' ), - cmbWidthType = dialog.getContentElement( 'info', 'cmbWidthType' ), - isPx = 1; - - if ( width ) - { - isPx = ( width.length < 3 || width.substr( width.length - 1 ) != '%' ); - width = parseInt( width, 10 ); - } + txtWidth = dialog.getContentElement( 'info', 'txtWidth' ); txtWidth && txtWidth.setValue( width, true ); - cmbWidthType && cmbWidthType.setValue( isPx ? 'pixels' : 'percents', true ); // Synchronize height value. var height = this.getStyle( 'height', '' ), txtHeight = dialog.getContentElement( 'info', 'txtHeight' ); - height && ( height = parseInt( height, 10 ) ); txtHeight && txtHeight.setValue( height, true ); }); } @@ -79,11 +86,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license if ( command == 'tableProperties' ) { - if ( ( selectedTable = editor.getSelection().getSelectedElement() ) ) - { - if ( selectedTable.getName() != 'table' ) - selectedTable = null; - } + if ( ( selectedTable = selection.getSelectedElement() ) ) + selectedTable = selectedTable.getAscendant( 'table', true ); else if ( ranges.length > 0 ) { // Webkit could report the following range on cell selection (#4948): @@ -119,11 +123,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license }, onOk : function() { - if ( this._.selectedElement ) - { - var selection = editor.getSelection(), - bms = editor.getSelection().createBookmarks(); - } + var selection = editor.getSelection(), + bms = this._.selectedElement && selection.createBookmarks(); var table = this._.selectedElement || makeElement( 'table' ), me = this, @@ -169,7 +170,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license for ( i = 0 ; i < theRow.getChildCount() ; i++ ) { var th = theRow.getChild( i ); - if ( th.type == CKEDITOR.NODE_ELEMENT ) + // Skip bookmark nodes. (#6155) + if ( th.type == CKEDITOR.NODE_ELEMENT && !th.data( 'cke-bookmark' ) ) { th.renameNode( 'th' ); th.setAttribute( 'scope', 'col' ); @@ -229,19 +231,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license } // Set the width and height. - var styles = []; - if ( info.txtHeight ) - table.setStyle( 'height', CKEDITOR.tools.cssLength( info.txtHeight ) ); - else - table.removeStyle( 'height' ); - - if ( info.txtWidth ) - { - var type = info.cmbWidthType || 'pixels'; - table.setStyle( 'width', info.txtWidth + ( type == 'pixels' ? 'px' : '%' ) ); - } - else - table.removeStyle( 'width' ); + info.txtHeight ? table.setStyle( 'height', info.txtHeight ) : table.removeStyle( 'height' ); + info.txtWidth ? table.setStyle( 'width', info.txtWidth ) : table.removeStyle( 'width' ); if ( !table.getAttribute( 'style' ) ) table.removeAttribute( 'style' ); @@ -249,12 +240,22 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Insert the table element if we're creating one. if ( !this._.selectedElement ) + { editor.insertElement( table ); - // Properly restore the selection inside table. (#4822) + // Override the default cursor position after insertElement to place + // cursor inside the first cell (#7959), IE needs a while. + setTimeout( function() + { + var firstCell = new CKEDITOR.dom.element( table.$.rows[ 0 ].cells[ 0 ] ); + var range = new CKEDITOR.dom.range( editor.document ); + range.moveToPosition( firstCell, CKEDITOR.POSITION_AFTER_START ); + range.select( 1 ); + }, 0 ); + } + // Properly restore the selection, (#4822) but don't break + // because of this, e.g. updated table caption. else - selection.selectBookmarks( bms ); - - return true; + try { selection.selectBookmarks( bms ); } catch( er ){} }, contents : [ { @@ -279,7 +280,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license 'default' : 3, label : editor.lang.table.rows, required : true, - style : 'width:5em', + controlStyle : 'width:5em', validate : function() { var pass = true, @@ -305,7 +306,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license 'default' : 2, label : editor.lang.table.columns, required : true, - style : 'width:5em', + controlStyle : 'width:5em', validate : function() { var pass = true, @@ -321,7 +322,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license }, setup : function( selectedTable ) { - this.setValue( selectedTable.$.rows[0].cells.length); + this.setValue( tableColumns( selectedTable ) ); }, commit : commitValue }, @@ -351,7 +352,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license for ( var row = 0 ; row < selectedTable.$.rows.length ; row++ ) { // If just one cell isn't a TH then it isn't a header column - if ( selectedTable.$.rows[row].cells[0].nodeName.toLowerCase() != 'th' ) + var headCell = selectedTable.$.rows[row].cells[0]; + if ( headCell && headCell.nodeName.toLowerCase() != 'th' ) { dialog.hasColumnHeaders = false; break; @@ -371,7 +373,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license id : 'txtBorder', 'default' : 1, label : editor.lang.table.border, - style : 'width:3em', + controlStyle : 'width:3em', validate : CKEDITOR.dialog.validate['number']( editor.lang.table.invalidBorder ), setup : function( selectedTable ) { @@ -389,13 +391,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license id : 'cmbAlign', type : 'select', 'default' : '', - label : editor.lang.table.align, + label : editor.lang.common.align, items : [ [ editor.lang.common.notSet , ''], - [ editor.lang.table.alignLeft , 'left'], - [ editor.lang.table.alignCenter , 'center'], - [ editor.lang.table.alignRight , 'right'] + [ editor.lang.common.alignLeft , 'left'], + [ editor.lang.common.alignCenter , 'center'], + [ editor.lang.common.alignRight , 'right'] ], setup : function( selectedTable ) { @@ -424,67 +426,21 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { type : 'text', id : 'txtWidth', - style : 'width:5em', - label : editor.lang.table.width, + controlStyle : 'width:5em', + label : editor.lang.common.width, + title : editor.lang.common.cssLengthTooltip, 'default' : 500, - validate : CKEDITOR.dialog.validate['number']( editor.lang.table.invalidWidth ), - - // Extra labelling of width unit type. - onLoad : function() - { - var widthType = this.getDialog().getContentElement( 'info', 'cmbWidthType' ), - labelElement = widthType.getElement(), - inputElement = this.getInputElement(), - ariaLabelledByAttr = inputElement.getAttribute( 'aria-labelledby' ); - - inputElement.setAttribute( 'aria-labelledby', [ ariaLabelledByAttr, labelElement.$.id ].join( ' ' ) ); - }, - + getValue : defaultToPixel, + validate : CKEDITOR.dialog.validate.cssLength( editor.lang.common.invalidCssLength.replace( '%1', editor.lang.common.width ) ), onChange : function() { var styles = this.getDialog().getContentElement( 'advanced', 'advStyles' ); - - if ( styles ) - { - var value = this.getValue(); - - if ( value ) - value += this.getDialog().getContentElement( 'info', 'cmbWidthType' ).getValue() == 'percents' ? '%' : 'px'; - - styles.updateStyle( 'width', value ); - } + styles && styles.updateStyle( 'width', this.getValue() ); }, - setup : function( selectedTable ) { - var widthMatch = widthPattern.exec( selectedTable.$.style.width ); - if ( widthMatch ) - this.setValue( widthMatch[1] ); - else - this.setValue( '' ); - }, - commit : commitValue - }, - { - id : 'cmbWidthType', - type : 'select', - label : editor.lang.table.widthUnit, - labelStyle: 'visibility:hidden', - 'default' : 'pixels', - items : - [ - [ editor.lang.table.widthPx , 'pixels'], - [ editor.lang.table.widthPc , 'percents'] - ], - setup : function( selectedTable ) - { - var widthMatch = widthPattern.exec( selectedTable.$.style.width ); - if ( widthMatch ) - this.setValue( widthMatch[2] == 'px' ? 'pixels' : 'percents' ); - }, - onChange : function() - { - this.getDialog().getContentElement( 'info', 'txtWidth' ).onChange(); + var val = selectedTable.getStyle( 'width' ); + val && this.setValue( val ); }, commit : commitValue } @@ -498,45 +454,24 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { type : 'text', id : 'txtHeight', - style : 'width:5em', - label : editor.lang.table.height, + controlStyle : 'width:5em', + label : editor.lang.common.height, + title : editor.lang.common.cssLengthTooltip, 'default' : '', - validate : CKEDITOR.dialog.validate['number']( editor.lang.table.invalidHeight ), - - // Extra labelling of height unit type. - onLoad : function() - { - var heightType = this.getDialog().getContentElement( 'info', 'htmlHeightType' ), - labelElement = heightType.getElement(), - inputElement = this.getInputElement(), - ariaLabelledByAttr = inputElement.getAttribute( 'aria-labelledby' ); - - inputElement.setAttribute( 'aria-labelledby', [ ariaLabelledByAttr, labelElement.$.id ].join( ' ' ) ); - }, - + getValue : defaultToPixel, + validate : CKEDITOR.dialog.validate.cssLength( editor.lang.common.invalidCssLength.replace( '%1', editor.lang.common.height ) ), onChange : function() { var styles = this.getDialog().getContentElement( 'advanced', 'advStyles' ); - - if ( styles ) - { - var value = this.getValue(); - styles.updateStyle( 'height', value && ( value + 'px' ) ); - } + styles && styles.updateStyle( 'height', this.getValue() ); }, setup : function( selectedTable ) { - var heightMatch = heightPattern.exec( selectedTable.$.style.height ); - if ( heightMatch ) - this.setValue( heightMatch[1] ); + var val = selectedTable.getStyle( 'width' ); + val && this.setValue( val ); }, commit : commitValue - }, - { - id : 'htmlHeightType', - type : 'html', - html : '