Skip to content
Permalink
Browse files

Merge branch 't/9726'

  • Loading branch information...
Garry Yao
Garry Yao committed Nov 29, 2012
2 parents 1a3cc56 + 3f80067 commit 009eab7a6a39cd4436bbac2b60377bf47c64ae24
Showing with 7 additions and 5 deletions.
  1. +7 −5 plugins/tabletools/dialogs/tableCell.js
@@ -12,7 +12,8 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) {
heightPattern = /^(\d+(?:\.\d+)?)px$/,
bind = CKEDITOR.tools.bind,
spacer = { type: 'html', html: ' ' },
rtl = editor.lang.dir == 'rtl';
rtl = editor.lang.dir == 'rtl',
colorDialog = editor.plugins.colordialog;

return {
title: langCell.title,
@@ -323,7 +324,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) {
selectedCell.removeAttribute( 'bgColor' );
}
},
{
colorDialog ? {
type: 'button',
id: 'bgColorChoose',
"class": 'colorChooser',
@@ -339,7 +340,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) {
this.focus();
}, this );
}
}
} : spacer
]
},
spacer,
@@ -369,7 +370,8 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) {
selectedCell.removeAttribute( 'borderColor' );
}
},
{

colorDialog ? {
type: 'button',
id: 'borderColorChoose',
"class": 'colorChooser',
@@ -386,7 +388,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) {
this.focus();
}, this );
}
}
} : spacer
]
}
]

0 comments on commit 009eab7

Please sign in to comment.
You can’t perform that action at this time.