From 70f8ae119ec8f4b01fab9cb39a10fca08facc432 Mon Sep 17 00:00:00 2001
From: Myron Turner <turnermm02@shaw.ca>
Date: Fri, 16 Nov 2018 09:46:34 -0600
Subject: [PATCH] Restored horizontal alignment to cell properties of table
 context menu

---
 .../plugins/tabletools/dialogs/tableCell.js   |   2 +-
 .../tabletools/dialogs/tableCell.js.unc       | 571 +++++++-----------
 2 files changed, 225 insertions(+), 348 deletions(-)

diff --git a/ckeditor/plugins/tabletools/dialogs/tableCell.js b/ckeditor/plugins/tabletools/dialogs/tableCell.js
index 8eb6722e..40370c27 100644
--- a/ckeditor/plugins/tabletools/dialogs/tableCell.js
+++ b/ckeditor/plugins/tabletools/dialogs/tableCell.js
@@ -1 +1 @@
-CKEDITOR.dialog.add("cellProperties",function(s){function u(c){return function(e){for(var g=c(e[0]),f=1;f<e.length;f++){if(c(e[f])!==g){g=null;break}}"undefined"!=typeof g&&(this.setValue(g),CKEDITOR.env.gecko&&"select"==this.type&&!g&&(this.getInputElement().$.selectedIndex=-1))}}function j(c){if(c=b.exec(c.getStyle("width")||c.getAttribute("width"))){return c[2]}}var q=s.lang.table,v=q.cell,t=s.lang.common,o=CKEDITOR.dialog.validate,b=/^(\d+(?:\.\d+)?)(px|%)$/,r={type:"html",html:"\x26nbsp;"},a="rtl"==s.lang.dir,i=s.plugins.colordialog;return{title:v.title,minWidth:CKEDITOR.env.ie&&CKEDITOR.env.quirks?150:110,minHeight:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?230:220,contents:[{id:"info",label:v.title,accessKey:"I",elements:[{type:"hbox",widths:["40%","5%","40%"],children:[{type:"vbox",hidden:true,padding:0,children:[{type:"hbox",widths:["70%","30%"],children:[{type:"text",id:"width",width:"100px",requiredContent:"td{width,height}",label:t.width,validate:o.number(v.invalidWidth),onLoad:function(){var e=this.getDialog().getContentElement("info","widthType").getElement(),d=this.getInputElement(),f=d.getAttribute("aria-labelledby");d.setAttribute("aria-labelledby",[f,e.$.id].join(" "))},setup:u(function(d){var c=parseInt(d.getAttribute("width"),10);d=parseInt(d.getStyle("width"),10);return isNaN(d)?isNaN(c)?"":c:d}),commit:function(e){var d=parseInt(this.getValue(),10),f=this.getDialog().getValueOf("info","widthType")||j(e);isNaN(d)?e.removeStyle("width"):e.setStyle("width",d+f);e.removeAttribute("width")},"default":""},{type:"select",id:"widthType",requiredContent:"td{width,height}",label:s.lang.table.widthUnit,labelStyle:"visibility:hidden","default":"px",items:[[q.widthPx,"px"],[q.widthPc,"%"]],setup:u(j)}]},{type:"hbox",widths:["70%","30%"],children:[{type:"text",id:"height",requiredContent:"td{width,height}",label:t.height,width:"100px","default":"",validate:o.number(v.invalidHeight),onLoad:function(){var e=this.getDialog().getContentElement("info","htmlHeightType").getElement(),d=this.getInputElement(),f=d.getAttribute("aria-labelledby");this.getDialog().getContentElement("info","height").isVisible()&&(e.setHtml("\x3cbr /\x3e"+q.widthPx),e.setStyle("display","block"),this.getDialog().getContentElement("info","hiddenSpacer").getElement().setStyle("display","block"));d.setAttribute("aria-labelledby",[f,e.$.id].join(" "))},setup:u(function(d){var c=parseInt(d.getAttribute("height"),10);d=parseInt(d.getStyle("height"),10);return isNaN(d)?isNaN(c)?"":c:d}),commit:function(d){var c=parseInt(this.getValue(),10);isNaN(c)?d.removeStyle("height"):d.setStyle("height",CKEDITOR.tools.cssLength(c));d.removeAttribute("height")}},{id:"htmlHeightType",type:"html",html:"",style:"display: none"}]},{type:"html",id:"hiddenSpacer",html:"\x26nbsp;",style:"display: none"},{type:"select",id:"wordWrap",label:v.wordWrap,"default":"yes",items:[[v.yes,"yes"],[v.no,"no"]],setup:u(function(d){var c=d.getAttribute("noWrap");if("nowrap"==d.getStyle("white-space")||c){return"no"}}),commit:function(c){"no"==this.getValue()?c.setStyle("white-space","nowrap"):c.removeStyle("white-space");c.removeAttribute("noWrap")}},r,{type:"select",id:"hAlign",label:v.hAlign,"default":"",items:[[t.notSet,""],[t.left,"left"],[t.center,"center"],[t.right,"right"],[t.justify,"justify"]],setup:u(function(d){var c=d.getAttribute("align");return d.getStyle("text-align")||c||""}),commit:function(d){var c=this.getValue();c?d.setStyle("text-align",c):d.removeStyle("text-align");d.removeAttribute("align")}},{type:"select",id:"vAlign",label:v.vAlign,"default":"",items:[[t.notSet,""],[t.alignTop,"top"],[t.alignMiddle,"middle"],[t.alignBottom,"bottom"],[v.alignBaseline,"baseline"]],setup:u(function(d){var c=d.getAttribute("vAlign");d=d.getStyle("vertical-align");switch(d){case"top":case"middle":case"bottom":case"baseline":break;default:d=""}return d||c||""}),commit:function(d){var c=this.getValue();c?d.setStyle("vertical-align",c):d.removeStyle("vertical-align");d.removeAttribute("vAlign")}}]},r,{type:"vbox",padding:0,children:[{type:"select",id:"cellType",label:v.cellType,"default":"td",items:[[v.data,"td"],[v.header,"th"]],setup:u(function(c){return c.getName()}),commit:function(c){c.renameNode(this.getValue())}},r,{type:"text",id:"rowSpan",label:v.rowSpan,"default":"",validate:o.integer(v.invalidRowSpan),setup:u(function(c){if((c=parseInt(c.getAttribute("rowSpan"),10))&&1!=c){return c}}),commit:function(d){var c=parseInt(this.getValue(),10);c&&1!=c?d.setAttribute("rowSpan",this.getValue()):d.removeAttribute("rowSpan")}},{type:"text",id:"colSpan",label:v.colSpan,"default":"",validate:o.integer(v.invalidColSpan),setup:u(function(c){if((c=parseInt(c.getAttribute("colSpan"),10))&&1!=c){return c}}),commit:function(d){var c=parseInt(this.getValue(),10);c&&1!=c?d.setAttribute("colSpan",this.getValue()):d.removeAttribute("colSpan")}},r,{type:"hbox",padding:0,hidden:true,widths:["60%","40%"],children:[{type:"text",id:"bgColor",label:v.bgColor,"default":"",setup:u(function(d){var c=d.getAttribute("bgColor");return d.getStyle("background-color")||c}),commit:function(c){this.getValue()?c.setStyle("background-color",this.getValue()):c.removeStyle("background-color");c.removeAttribute("bgColor")}},i?{type:"button",id:"bgColorChoose","class":"colorChooser",label:v.chooseColor,onLoad:function(){this.getElement().getParent().setStyle("vertical-align","bottom")},onClick:function(){s.getColorFromDialog(function(c){c&&this.getDialog().getContentElement("info","bgColor").setValue(c);this.focus()},this)}}:r]},r,{type:"hbox",padding:0,widths:["60%","40%"],children:[{type:"text",hidden:true,id:"borderColor",label:v.borderColor,"default":"",setup:u(function(d){var c=d.getAttribute("borderColor");return d.getStyle("border-color")||c}),commit:function(c){this.getValue()?c.setStyle("border-color",this.getValue()):c.removeStyle("border-color");c.removeAttribute("borderColor")}},i?{type:"button",id:"borderColorChoose","class":"colorChooser",label:v.chooseColor,hidden:true,style:(a?"margin-right":"margin-left")+": 10px",onLoad:function(){this.getElement().getParent().setStyle("vertical-align","bottom")},onClick:function(){s.getColorFromDialog(function(c){c&&this.getDialog().getContentElement("info","borderColor").setValue(c);this.focus()},this)}}:r]}]}]}]}],onShow:function(){this.cells=CKEDITOR.plugins.tabletools.getSelectedCells(this._.editor.getSelection());this.setupContent(this.cells)},onOk:function(){for(var f=this._.editor.getSelection(),e=f.createBookmarks(),h=this.cells,g=0;g<h.length;g++){this.commitContent(h[g])}this._.editor.forceNextSelectionCheck();f.selectBookmarks(e);this._.editor.selectionChange()},onLoad:function(){var c={};this.foreach(function(d){d.setup&&d.commit&&(d.setup=CKEDITOR.tools.override(d.setup,function(e){return function(){e.apply(this,arguments);c[d.id]=d.getValue()}}),d.commit=CKEDITOR.tools.override(d.commit,function(e){return function(){c[d.id]!==d.getValue()&&e.apply(this,arguments)}}))})}}});
\ No newline at end of file
+CKEDITOR.dialog.add("cellProperties",function(g){var c=g.lang.table,e=c.cell,d=g.lang.common,k=CKEDITOR.dialog.validate,l=/^(\d+(?:\.\d+)?)(px|%)$/,h={type:"html",html:"&nbsp;"},b,j=g.lang.dir=="rtl",a=g.plugins.colordialog;function i(m){return function(n){var p=m(n[0]);for(var o=1;o<n.length;o++){if(m(n[o])!==p){p=null;break}}if(typeof p!="undefined"){this.setValue(p);if(CKEDITOR.env.gecko&&this.type=="select"&&!p){this.getInputElement().$.selectedIndex=-1}}}}function f(m){var n=l.exec(m.getStyle("width")||m.getAttribute("width"));if(n){return n[2]}}return{title:e.title,minWidth:CKEDITOR.env.ie&&CKEDITOR.env.quirks?450:410,minHeight:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?230:220,contents:[{id:"info",label:e.title,accessKey:"I",elements:[{type:"hbox",widths:["40%","5%","40%"],children:[{type:"vbox",padding:0,children:[b={type:"html",id:"hiddenSpacer",html:"&nbsp;",style:"display: none"},h,{type:"select",id:"hAlign",label:e.hAlign,"default":"",items:[[d.notSet,""],[d.left,"left"],[d.center,"center"],[d.right,"right"]],setup:i(function(n){var o=n.getAttribute("align"),m=n.getStyle("text-align");return m||o||""}),commit:function(m){var n=this.getValue();if(n){m.setStyle("text-align",n)}else{m.removeStyle("text-align")}m.removeAttribute("align")}}]},h,{type:"vbox",padding:0,children:[{type:"select",id:"cellType",label:e.cellType,"default":"td",items:[[e.data,"td"],[e.header,"th"]],setup:i(function(m){return m.getName()}),commit:function(m){m.renameNode(this.getValue())}},h,{type:"text",id:"rowSpan",label:e.rowSpan,"default":"",validate:k.integer(e.invalidRowSpan),setup:i(function(m){var n=parseInt(m.getAttribute("rowSpan"),10);if(n&&n!=1){return n}}),commit:function(m){var n=parseInt(this.getValue(),10);if(n&&n!=1){m.setAttribute("rowSpan",this.getValue())}else{m.removeAttribute("rowSpan")}}},{type:"text",id:"colSpan",label:e.colSpan,"default":"",validate:k.integer(e.invalidColSpan),setup:i(function(n){var m=parseInt(n.getAttribute("colSpan"),10);if(m&&m!=1){return m}}),commit:function(m){var n=parseInt(this.getValue(),10);if(n&&n!=1){m.setAttribute("colSpan",this.getValue())}else{m.removeAttribute("colSpan")}}}]}]}]}],onShow:function(){this.cells=CKEDITOR.plugins.tabletools.getSelectedCells(this._.editor.getSelection());this.setupContent(this.cells)},onOk:function(){var p=this._.editor.getSelection(),o=p.createBookmarks();var m=this.cells;for(var n=0;n<m.length;n++){this.commitContent(m[n])}this._.editor.forceNextSelectionCheck();p.selectBookmarks(o);this._.editor.selectionChange()},onLoad:function(){var m={};this.foreach(function(n){if(!n.setup||!n.commit){return}n.setup=CKEDITOR.tools.override(n.setup,function(o){return function(){o.apply(this,arguments);m[n.id]=n.getValue()}});n.commit=CKEDITOR.tools.override(n.commit,function(o){return function(){if(m[n.id]!==n.getValue()){o.apply(this,arguments)}}})})}}});
\ No newline at end of file
diff --git a/ckeditor/plugins/tabletools/dialogs/tableCell.js.unc b/ckeditor/plugins/tabletools/dialogs/tableCell.js.unc
index b0333acd..82905149 100755
--- a/ckeditor/plugins/tabletools/dialogs/tableCell.js.unc
+++ b/ckeditor/plugins/tabletools/dialogs/tableCell.js.unc
@@ -1,348 +1,225 @@
-/*
- Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-*/
-CKEDITOR.dialog.add("cellProperties", function(f) {
-    function d(a) {
-        return function(b) {
-            for (var c = a(b[0]), d = 1; d < b.length; d++)
-                if (a(b[d]) !== c) {
-                    c = null;
-                    break
-                }
-            "undefined" != typeof c && (this.setValue(c), CKEDITOR.env.gecko && "select" == this.type && !c && (this.getInputElement().$.selectedIndex = -1))
-        }
-    }
+/**
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
 
-    function l(a) {
-        if (a = n.exec(a.getStyle("width") || a.getAttribute("width"))) return a[2]
-    }
-    var h = f.lang.table,
-        c = h.cell,
-        e = f.lang.common,
-        k = CKEDITOR.dialog.validate,
-        n = /^(\d+(?:\.\d+)?)(px|%)$/,
-        g = {
-            type: "html",
-            html: "\x26nbsp;"
-        },
-        p = "rtl" ==
-        f.lang.dir,
-        m = f.plugins.colordialog;
-    return {
-        title: c.title,
-        minWidth: CKEDITOR.env.ie && CKEDITOR.env.quirks ? 150: 110,
-        minHeight: CKEDITOR.env.ie && (CKEDITOR.env.ie7Compat || CKEDITOR.env.quirks) ? 230 : 220,
-        contents: [{
-            id: "info",
-            label: c.title,
-            accessKey: "I",
-            elements: [{
-                type: "hbox",
-               // hidden: true,
-                widths: ["40%", "5%", "40%"],
-                children: [{
-                    type: "vbox",
-                    hidden:true,
-                    padding: 0,
-                    children: [{
-                        type: "hbox",
-                        widths: ["70%", "30%"],
-                        children: [{
-                            type: "text",
-                            id: "width",
-                            width: "100px",
-                            requiredContent: "td{width,height}",
-                            label: e.width,
-                            validate: k.number(c.invalidWidth),
-                            onLoad: function() {
-                                var a =
-                                    this.getDialog().getContentElement("info", "widthType").getElement(),
-                                    b = this.getInputElement(),
-                                    c = b.getAttribute("aria-labelledby");
-                                b.setAttribute("aria-labelledby", [c, a.$.id].join(" "))
-                            },
-                            setup: d(function(a) {
-                                var b = parseInt(a.getAttribute("width"), 10);
-                                a = parseInt(a.getStyle("width"), 10);
-                                return isNaN(a) ? isNaN(b) ? "" : b : a
-                            }),
-                            commit: function(a) {
-                                var b = parseInt(this.getValue(), 10),
-                                    c = this.getDialog().getValueOf("info", "widthType") || l(a);
-                                isNaN(b) ? a.removeStyle("width") : a.setStyle("width", b + c);
-                                a.removeAttribute("width")
-                            },
-                            "default": ""
-                        }, {
-                            type: "select",
-                            id: "widthType",
-                            requiredContent: "td{width,height}",
-                            label: f.lang.table.widthUnit,
-                            labelStyle: "visibility:hidden",
-                            "default": "px",
-                            items: [
-                                [h.widthPx, "px"],
-                                [h.widthPc, "%"]
-                            ],
-                            setup: d(l)
-                        }]
-                    }, {
-                        type: "hbox",
-                        widths: ["70%", "30%"],
-                        children: [{
-                            type: "text",
-                            id: "height",
-                            requiredContent: "td{width,height}",
-                            label: e.height,
-                            width: "100px",
-                            "default": "",
-                            validate: k.number(c.invalidHeight),
-                            onLoad: function() {
-                                var a = this.getDialog().getContentElement("info", "htmlHeightType").getElement(),
-                                    b = this.getInputElement(),
-                                    c = b.getAttribute("aria-labelledby");
-                                this.getDialog().getContentElement("info", "height").isVisible() && (a.setHtml("\x3cbr /\x3e" + h.widthPx), a.setStyle("display", "block"), this.getDialog().getContentElement("info", "hiddenSpacer").getElement().setStyle("display", "block"));
-                                b.setAttribute("aria-labelledby", [c, a.$.id].join(" "))
-                            },
-                            setup: d(function(a) {
-                                var b = parseInt(a.getAttribute("height"), 10);
-                                a = parseInt(a.getStyle("height"), 10);
-                                return isNaN(a) ? isNaN(b) ? "" : b : a
-                            }),
-                            commit: function(a) {
-                                var b = parseInt(this.getValue(),
-                                    10);
-                                isNaN(b) ? a.removeStyle("height") : a.setStyle("height", CKEDITOR.tools.cssLength(b));
-                                a.removeAttribute("height")
-                            }
-                        }, {
-                            id: "htmlHeightType",
-                            type: "html",
-                            html: "",
-                            style: "display: none"
-                        }]
-                    }, {
-                        type: "html",
-                        id: "hiddenSpacer",
-                        html: "\x26nbsp;",
-                        style: "display: none"
-                    }, {
-                        type: "select",
-                        id: "wordWrap",
-                        label: c.wordWrap,
-                        "default": "yes",
-                        items: [
-                            [c.yes, "yes"],
-                            [c.no, "no"]
-                        ],
-                        setup: d(function(a) {
-                            var b = a.getAttribute("noWrap");
-                            if ("nowrap" == a.getStyle("white-space") || b) return "no"
-                        }),
-                        commit: function(a) {
-                            "no" == this.getValue() ? a.setStyle("white-space",
-                                "nowrap") : a.removeStyle("white-space");
-                            a.removeAttribute("noWrap")
-                        }
-                    }, g, {
-                        type: "select",
-                        id: "hAlign",
-                        label: c.hAlign,
-                        "default": "",
-                        items: [
-                            [e.notSet, ""],
-                            [e.left, "left"],
-                            [e.center, "center"],
-                            [e.right, "right"],
-                            [e.justify, "justify"]
-                        ],
-                        setup: d(function(a) {
-                            var b = a.getAttribute("align");
-                            return a.getStyle("text-align") || b || ""
-                        }),
-                        commit: function(a) {
-                            var b = this.getValue();
-                            b ? a.setStyle("text-align", b) : a.removeStyle("text-align");
-                            a.removeAttribute("align")
-                        }
-                    }, {
-                        type: "select",
-                        id: "vAlign",
-                        label: c.vAlign,
-                        "default": "",
-                        items: [
-                            [e.notSet,
-                                ""
-                            ],
-                            [e.alignTop, "top"],
-                            [e.alignMiddle, "middle"],
-                            [e.alignBottom, "bottom"],
-                            [c.alignBaseline, "baseline"]
-                        ],
-                        setup: d(function(a) {
-                            var b = a.getAttribute("vAlign");
-                            a = a.getStyle("vertical-align");
-                            switch (a) {
-                                case "top":
-                                case "middle":
-                                case "bottom":
-                                case "baseline":
-                                    break;
-                                default:
-                                    a = ""
-                            }
-                            return a || b || ""
-                        }),
-                        commit: function(a) {
-                            var b = this.getValue();
-                            b ? a.setStyle("vertical-align", b) : a.removeStyle("vertical-align");
-                            a.removeAttribute("vAlign")
-                        }
-                    }]
-                }, g, {
-                    type: "vbox",
-                    padding: 0,
-                    children: [{
-                        type: "select",
-                        id: "cellType",
-                        label: c.cellType,
-                        "default": "td",
-                        items: [
-                            [c.data, "td"],
-                            [c.header, "th"]
-                        ],
-                        setup: d(function(a) {
-                            return a.getName()
-                        }),
-                        commit: function(a) {
-                            a.renameNode(this.getValue())
-                        }
-                    }, g, {
-                        type: "text",
-                        id: "rowSpan",
-                        label: c.rowSpan,
-                        "default": "",
-                        validate: k.integer(c.invalidRowSpan),
-                        setup: d(function(a) {
-                            if ((a = parseInt(a.getAttribute("rowSpan"), 10)) && 1 != a) return a
-                        }),
-                        commit: function(a) {
-                            var b = parseInt(this.getValue(), 10);
-                            b && 1 != b ? a.setAttribute("rowSpan", this.getValue()) : a.removeAttribute("rowSpan")
-                        }
-                    }, {
-                        type: "text",
-                        id: "colSpan",
-                        label: c.colSpan,
-                        "default": "",
-                        validate: k.integer(c.invalidColSpan),
-                        setup: d(function(a) {
-                            if ((a = parseInt(a.getAttribute("colSpan"), 10)) && 1 != a) return a
-                        }),
-                        commit: function(a) {
-                            var b = parseInt(this.getValue(), 10);
-                            b && 1 != b ? a.setAttribute("colSpan", this.getValue()) : a.removeAttribute("colSpan")
-                        }
-                    }, g, {
-                        type: "hbox",
-                        padding: 0,
-                        hidden: true,
-                        widths: ["60%", "40%"],
-                        children: [{
-                            type: "text",
-                            id: "bgColor",
-                            label: c.bgColor,
-                            "default": "",
-                            setup: d(function(a) {
-                                var b = a.getAttribute("bgColor");
-                                return a.getStyle("background-color") || b
-                            }),
-                            commit: function(a) {
-                                this.getValue() ? a.setStyle("background-color",
-                                    this.getValue()) : a.removeStyle("background-color");
-                                a.removeAttribute("bgColor")
-                            }
-                        }, m ? {
-                            type: "button",
-                            id: "bgColorChoose",
-                            "class": "colorChooser",
-                            label: c.chooseColor,
-                            onLoad: function() {
-                                this.getElement().getParent().setStyle("vertical-align", "bottom")
-                            },
-                            onClick: function() {
-                                f.getColorFromDialog(function(a) {
-                                    a && this.getDialog().getContentElement("info", "bgColor").setValue(a);
-                                    this.focus()
-                                }, this)
-                            }
-                        } : g]
-                    }, g, {
-                        type: "hbox",
-                        padding: 0,
-                        widths: ["60%", "40%"],
-                        children: [{
-                            type: "text",
-                            hidden: true,
-                            id: "borderColor",
-                            label: c.borderColor,
-                            "default": "",
-                            setup: d(function(a) {
-                                var b = a.getAttribute("borderColor");
-                                return a.getStyle("border-color") || b
-                            }),
-                            commit: function(a) {
-                                this.getValue() ? a.setStyle("border-color", this.getValue()) : a.removeStyle("border-color");
-                                a.removeAttribute("borderColor")
-                            }
-                        }, m ? {
-                            type: "button",
-                            id: "borderColorChoose",
-                            "class": "colorChooser",
-                            label: c.chooseColor,
-                            hidden: true,
-                            style: (p ? "margin-right" : "margin-left") + ": 10px",
-                            onLoad: function() {
-                                this.getElement().getParent().setStyle("vertical-align", "bottom")
-                            },
-                            onClick: function() {
-                                f.getColorFromDialog(function(a) {
-                                    a &&
-                                        this.getDialog().getContentElement("info", "borderColor").setValue(a);
-                                    this.focus()
-                                }, this)
-                            }
-                        } : g]
-                    }]
-                }]
-            }]
-        }],
-        onShow: function() {
-            this.cells = CKEDITOR.plugins.tabletools.getSelectedCells(this._.editor.getSelection());
-            this.setupContent(this.cells)
-        },
-        onOk: function() {
-            for (var a = this._.editor.getSelection(), b = a.createBookmarks(), c = this.cells, d = 0; d < c.length; d++) this.commitContent(c[d]);
-            this._.editor.forceNextSelectionCheck();
-            a.selectBookmarks(b);
-            this._.editor.selectionChange()
-        },
-        onLoad: function() {
-            var a = {};
-            this.foreach(function(b) {
-                b.setup &&
-                    b.commit && (b.setup = CKEDITOR.tools.override(b.setup, function(c) {
-                        return function() {
-                            c.apply(this, arguments);
-                            a[b.id] = b.getValue()
-                        }
-                    }), b.commit = CKEDITOR.tools.override(b.commit, function(c) {
-                        return function() {
-                            a[b.id] !== b.getValue() && c.apply(this, arguments)
-                        }
-                    }))
-            })
-        }
-    }
-});
\ No newline at end of file
+CKEDITOR.dialog.add( 'cellProperties', function( editor ) {
+	var langTable = editor.lang.table,
+		langCell = langTable.cell,
+		langCommon = editor.lang.common,
+		validate = CKEDITOR.dialog.validate,
+		widthPattern = /^(\d+(?:\.\d+)?)(px|%)$/,
+		spacer = { type: 'html', html: '&nbsp;' },
+		hiddenSpacer,
+		rtl = editor.lang.dir == 'rtl',
+		colorDialog = editor.plugins.colordialog;
+
+	// Returns a function, which runs regular "setup" for all selected cells to find out
+	// whether the initial value of the field would be the same for all cells. If so,
+	// the value is displayed just as if a regular "setup" was executed. Otherwise,
+	// i.e. when there are several cells of different value of the property, a field
+	// gets empty value.
+	//
+	// * @param {Function} setup Setup function which returns a value instead of setting it.
+	// * @returns {Function} A function to be used in dialog definition.
+	function setupCells( setup ) {
+		return function( cells ) {
+			var fieldValue = setup( cells[ 0 ] );
+
+			// If one of the cells would have a different value of the
+			// property, set the empty value for a field.
+			for ( var i = 1; i < cells.length; i++ ) {
+				if ( setup( cells[ i ] ) !== fieldValue ) {
+					fieldValue = null;
+					break;
+				}
+			}
+
+			// Setting meaningful or empty value only makes sense
+			// when setup returns some value. Otherwise, a *default* value
+			// is used for that field.
+			if ( typeof fieldValue != 'undefined' ) {
+				this.setValue( fieldValue );
+
+				// The only way to have an empty select value in Firefox is
+				// to set a negative selectedIndex.
+				if ( CKEDITOR.env.gecko && this.type == 'select' && !fieldValue )
+					this.getInputElement().$.selectedIndex = -1;
+			}
+		};
+	}
+
+	// Reads the unit of width property of the table cell.
+	//
+	// * @param {CKEDITOR.dom.element} cell An element representing table cell.
+	// * @returns {String} A unit of width: 'px', '%' or undefined if none.
+	function getCellWidthType( cell ) {
+		var match = widthPattern.exec(
+			cell.getStyle( 'width' ) || cell.getAttribute( 'width' ) );
+
+		if ( match )
+			return match[ 2 ];
+	}
+
+	return {
+		title: langCell.title,
+		minWidth: CKEDITOR.env.ie && CKEDITOR.env.quirks ? 450 : 410,
+		minHeight: CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.quirks ) ? 230 : 220,
+		contents: [ {
+			id: 'info',
+			label: langCell.title,
+			accessKey: 'I',
+			elements: [ {
+				type: 'hbox',
+				widths: [ '40%', '5%', '40%' ],
+				children: [ {
+					type: 'vbox',
+					padding: 0,
+					children: [ 
+
+
+					hiddenSpacer = {
+						type: 'html',
+						id: 'hiddenSpacer',
+						html: '&nbsp;',
+						style: 'display: none'
+					},
+					spacer,
+					{
+						type: 'select',
+						id: 'hAlign',
+						label: langCell.hAlign,
+						'default': '',
+						items: [
+							[ langCommon.notSet, '' ],
+							[ langCommon.left, 'left' ],
+							[ langCommon.center, 'center' ],
+							[ langCommon.right, 'right' ]						
+						],
+						setup: setupCells( function( element ) {
+							var alignAttr = element.getAttribute( 'align' ),
+								textAlignStyle = element.getStyle( 'text-align' );
+
+							return textAlignStyle || alignAttr || '';
+						} ),
+						commit: function( selectedCell ) {
+							var value = this.getValue();
+
+							if ( value )
+								selectedCell.setStyle( 'text-align', value );
+							else
+								selectedCell.removeStyle( 'text-align' );
+
+							selectedCell.removeAttribute( 'align' );
+						}
+					},
+ ]
+				},
+				spacer,
+				{
+					type: 'vbox',
+					padding: 0,
+					children: [ {
+						type: 'select',
+						id: 'cellType',
+						label: langCell.cellType,
+						'default': 'td',
+						items: [
+							[ langCell.data, 'td' ],
+							[ langCell.header, 'th' ]
+						],
+						setup: setupCells( function( selectedCell ) {
+							return selectedCell.getName();
+						} ),
+						commit: function( selectedCell ) {
+							selectedCell.renameNode( this.getValue() );
+						}
+					},
+					spacer,
+					{
+						type: 'text',
+						id: 'rowSpan',
+						label: langCell.rowSpan,
+						'default': '',
+						validate: validate.integer( langCell.invalidRowSpan ),
+						setup: setupCells( function( selectedCell ) {
+							var attrVal = parseInt( selectedCell.getAttribute( 'rowSpan' ), 10 );
+							if ( attrVal && attrVal != 1 )
+								return attrVal;
+						} ),
+						commit: function( selectedCell ) {
+							var value = parseInt( this.getValue(), 10 );
+							if ( value && value != 1 )
+								selectedCell.setAttribute( 'rowSpan', this.getValue() );
+							else
+								selectedCell.removeAttribute( 'rowSpan' );
+						}
+					},
+					{
+						type: 'text',
+						id: 'colSpan',
+						label: langCell.colSpan,
+						'default': '',
+						validate: validate.integer( langCell.invalidColSpan ),
+						setup: setupCells( function( element ) {
+							var attrVal = parseInt( element.getAttribute( 'colSpan' ), 10 );
+							if ( attrVal && attrVal != 1 )
+								return attrVal;
+						} ),
+						commit: function( selectedCell ) {
+							var value = parseInt( this.getValue(), 10 );
+							if ( value && value != 1 )
+								selectedCell.setAttribute( 'colSpan', this.getValue() );
+							else
+								selectedCell.removeAttribute( 'colSpan' );
+						}
+					},
+           ]
+				} ]
+			} ]
+		} ],
+		onShow: function() {
+			this.cells = CKEDITOR.plugins.tabletools.getSelectedCells( this._.editor.getSelection() );
+			this.setupContent( this.cells );
+		},
+		onOk: function() {
+			var selection = this._.editor.getSelection(),
+				bookmarks = selection.createBookmarks();
+
+			var cells = this.cells;
+			for ( var i = 0; i < cells.length; i++ )
+				this.commitContent( cells[ i ] );
+
+			this._.editor.forceNextSelectionCheck();
+			selection.selectBookmarks( bookmarks );
+			this._.editor.selectionChange();
+		},
+		onLoad: function() {
+			var saved = {};
+
+			// Prevent from changing cell properties when the field's value
+			// remains unaltered, i.e. when selected multiple cells and dialog loaded
+			// only the properties of the first cell (https://dev.ckeditor.com/ticket/11439).
+			this.foreach( function( field ) {
+				if ( !field.setup || !field.commit )
+					return;
+
+				// Save field's value every time after "setup" is called.
+				field.setup = CKEDITOR.tools.override( field.setup, function( orgSetup ) {
+					return function() {
+						orgSetup.apply( this, arguments );
+						saved[ field.id ] = field.getValue();
+					};
+				} );
+
+				// Compare saved value with actual value. Update cell only if value has changed.
+				field.commit = CKEDITOR.tools.override( field.commit, function( orgCommit ) {
+					return function() {
+						if ( saved[ field.id ] !== field.getValue() )
+							orgCommit.apply( this, arguments );
+					};
+				} );
+			} );
+		}
+	};
+} );