Merge branch 't/9726'

Garry Yao · Garry Yao · commit 009eab7a6a39 · 2012-11-29T17:09:35.000+08:00
diff --git a/plugins/tabletools/dialogs/tableCell.js b/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: '&nbsp;' },
-		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
 						]
 					}
 					]

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) {`
`12`	`12`	`heightPattern = /^(\d+(?:\.\d+)?)px$/,`
`13`	`13`	`bind = CKEDITOR.tools.bind,`
`14`	`14`	`spacer = { type: 'html', html: ' ' },`
`15`		`- rtl = editor.lang.dir == 'rtl';`
	`15`	`+ rtl = editor.lang.dir == 'rtl',`
	`16`	`+ colorDialog = editor.plugins.colordialog;`
`16`	`17`
`17`	`18`	`return {`
`18`	`19`	`title: langCell.title,`
`@@ -323,7 +324,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) {`
`323`	`324`	`selectedCell.removeAttribute( 'bgColor' );`
`324`	`325`	`}`
`325`	`326`	`},`
`326`		`- {`
	`327`	`+ colorDialog ? {`
`327`	`328`	`type: 'button',`
`328`	`329`	`id: 'bgColorChoose',`
`329`	`330`	`"class": 'colorChooser',`
`@@ -339,7 +340,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) {`
`339`	`340`	`this.focus();`
`340`	`341`	`}, this );`
`341`	`342`	`}`
`342`		`- }`
	`343`	`+ } : spacer`
`343`	`344`	`]`
`344`	`345`	`},`
`345`	`346`	`spacer,`
`@@ -369,7 +370,8 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) {`
`369`	`370`	`selectedCell.removeAttribute( 'borderColor' );`
`370`	`371`	`}`
`371`	`372`	`},`
`372`		`- {`
	`373`	`+`
	`374`	`+ colorDialog ? {`
`373`	`375`	`type: 'button',`
`374`	`376`	`id: 'borderColorChoose',`
`375`	`377`	`"class": 'colorChooser',`
`@@ -386,7 +388,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor ) {`
`386`	`388`	`this.focus();`
`387`	`389`	`}, this );`
`388`	`390`	`}`
`389`		`- }`
	`391`	`+ } : spacer`
`390`	`392`	`]`
`391`	`393`	`}`
`392`	`394`	`]`