muck-contents 0.2.21 → 0.2.22

data/public/javascripts/tiny_mce/plugins/style/langs/sk_dlg.js

@@ -1,12 +1,12 @@
 tinyMCE.addI18n('sk.style_dlg',{
-title:"Editova\u0165 CSS \u0161t\u00FDl",
+title:"Upravi\u0165 CSS",
 apply:"Aplikova\u0165",
 text_tab:"Text",
 background_tab:"Pozadie",
-block_tab:"Block",
+block_tab:"Blok",
 box_tab:"Box",
-border_tab:"Border",
-list_tab:"List",
+border_tab:"R\u00E1m\u010Dek",
+list_tab:"Zoznam",
 positioning_tab:"Positioning",
 text_props:"Text",
 text_font:"Font",
@@ -14,19 +14,19 @@ text_size:"Ve\u013Ekos\u0165",
 text_weight:"Weight",
 text_style:"Style",
 text_variant:"Variant",
-text_lineheight:"Line height",
+text_lineheight:"Odsadenie riadkov",
 text_case:"Case",
 text_color:"Farba",
-text_decoration:"Decoration",
+text_decoration:"Dekor\u00E1cia",
 text_overline:"overline",
 text_underline:"underline",
 text_striketrough:"strikethrough",
 text_blink:"blink",
-text_none:"none",
-background_color:"Background color",
-background_image:"Background image",
+text_none:"\u017Eiadne",
+background_color:"Farba pozadia",
+background_image:"Obr\u00E1zok pozadia",
 background_repeat:"Repeat",
-background_attachment:"Attachment",
+background_attachment:"Pr\u00EDloha",
 background_hpos:"Horizontal position",
 background_vpos:"Vertical position",
 block_wordspacing:"Word spacing",

data/public/javascripts/tiny_mce/plugins/style/langs/th_dlg.js

@@ -14,7 +14,7 @@ text_size:"\u0E02\u0E19\u0E32\u0E14",
 text_weight:"\u0E19\u0E49\u0E33\u0E2B\u0E19\u0E31\u0E01",
 text_style:"\u0E23\u0E39\u0E1B\u0E41\u0E1A\u0E1A",
 text_variant:"Variant",
-text_lineheight:"\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E39\u0E07\u0E02\u0E2D\u0E07\u0E1A\u0E31\u0E19\u0E17\u0E31\u0E14",
+text_lineheight:"\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E39\u0E07\u0E02\u0E2D\u0E07\u0E1A\u0E23\u0E23\u0E17\u0E31\u0E14",
 text_case:"Case",
 text_color:"\u0E2A\u0E35",
 text_decoration:"Decoration",
@@ -48,8 +48,8 @@ bottom:"\u0E25\u0E48\u0E32\u0E07",
 left:"\u0E0B\u0E49\u0E32\u0E22",
 margin:"Margin",
 style:"\u0E23\u0E39\u0E1B\u0E41\u0E1A\u0E1A",
-width:"Width",
-height:"Height",
+width:"\u0E01\u0E27\u0E49\u0E32\u0E07",
+height:"\u0E2A\u0E39\u0E07",
 color:"\u0E2A\u0E35",
 list_type:"Type",
 bullet_image:"Bullet image",

data/public/javascripts/tiny_mce/plugins/style/langs/tr_dlg.js

@@ -1,27 +1,27 @@
 tinyMCE.addI18n('tr.style_dlg',{
-title:"CSS Stili D\u00FCzenle",
+title:"CSS Stilini D\u00FCzenle",
 apply:"Uygula",
 text_tab:"Metin",
 background_tab:"Arkaplan",
 block_tab:"Blok",
 box_tab:"Kutu",
 border_tab:"Kenarl\u0131k",
-list_tab:"Liste",
+list_tab:"Listele",
 positioning_tab:"Konumland\u0131rma",
 text_props:"Metin",
-text_font:"Yaz\u0131 Tipi",
+text_font:"Yaz\u0131 tipi",
 text_size:"Boyut",
 text_weight:"Kal\u0131nl\u0131k",
 text_style:"Stil",
 text_variant:"De\u011Fi\u015Fken",
-text_lineheight:"Sat\u0131r y\u00FCksekli\u011Fi",
-text_case:"B\u00FCy\u00FCk/k\u00FC\u00E7\u00FCk",
+text_lineheight:"\u00C7izgi y\u00FCksekli\u011Fi",
+text_case:"Ko\u015Ful",
 text_color:"Renk",
 text_decoration:"Dekorasyon",
-text_overline:"\u00DCst \u00E7izgi",
-text_underline:"Alt \u00E7izgi",
-text_striketrough:"Ortas\u0131 \u00E7izgili",
-text_blink:"yan\u0131p s\u00F6n",
+text_overline:"\u00FCst \u00E7izgi",
+text_underline:"alt \u00E7izgi",
+text_striketrough:"\u00FCst\u00FC \u00E7izgili",
+text_blink:"yan\u0131p s\u00F6nen",
 text_none:"hi\u00E7biri",
 background_color:"Arkaplan rengi",
 background_image:"Arkaplan resmi",
@@ -29,19 +29,19 @@ background_repeat:"Tekrarla",
 background_attachment:"Eklenti",
 background_hpos:"Yatay konum",
 background_vpos:"Dikey konum",
-block_wordspacing:"S\u00F6zc\u00FCk bo\u015Flu\u011Fu",
-block_letterspacing:"Harf bo\u015Flu\u011Fu",
+block_wordspacing:"Kelime bo\u015Flu\u011Fu",
+block_letterspacing:"harf bo\u015Flu\u011Fu",
 block_vertical_alignment:"Dikey hizalama",
-block_text_align:"Metin hizalama",
-block_text_indent:"Metin kayd\u0131rma",
+block_text_align:"Metin hizala",
+block_text_indent:"Metnin girintisini art\u0131r",
 block_whitespace:"Bo\u015Fluk",
-block_display:"G\u00F6r\u00FCnt\u00FCleme",
+block_display:"G\u00F6r\u00FCnt\u00FCle",
 box_width:"Geni\u015Flik",
 box_height:"Y\u00FCkseklik",
 box_float:"Kayan",
 box_clear:"Serbest",
 padding:"Dolgu",
-same:"T\u00FCm\u00FC i\u00E7in ayn\u0131",
+same:"T\u00FCm\u00FC i\u00E7in",
 top:"\u00DCst",
 right:"Sa\u011F",
 bottom:"Alt",
@@ -56,8 +56,8 @@ bullet_image:"Madde imi resmi",
 position:"Konum",
 positioning_type:"Tip",
 visibility:"G\u00F6r\u00FCn\u00FCrl\u00FCk",
-zindex:"Z-s\u0131ras\u0131",
+zindex:"Z-indeksi",
 overflow:"Ta\u015Fma",
-placement:"Yerle\u015Ftirme",
-clip:"K\u0131rpma"
+placement:"Yerle\u015Ftir",
+clip:"K\u0131rp"
 });

data/public/javascripts/tiny_mce/plugins/style/langs/tw_dlg.js

@@ -9,13 +9,13 @@ border_tab:"\u908A\u6846",
 list_tab:"\u6E05\u55AE",
 positioning_tab:"\u4F4D\u7F6E",
 text_props:"\u6587\u5B57",
-text_font:"\u5B57\u9AD4",
+text_font:"\u5B57\u578B",
 text_size:"\u5927\u5C0F",
 text_weight:"\u7C97\u7D30",
 text_style:"\u6A23\u5F0F",
 text_variant:"\u8B8A\u9AD4",
 text_lineheight:"\u884C\u9AD8",
-text_case:"\u5B57\u9AD4",
+text_case:"\u5B57\u578B",
 text_color:"\u984F\u8272",
 text_decoration:"\u4FEE\u98FE",
 text_overline:"\u4E0A\u7AEF\u7DDA",

data/public/javascripts/tiny_mce/plugins/style/langs/uk_dlg.js

@@ -5,7 +5,7 @@ text_tab:"\u0422\u0435\u043A\u0441\u0442",
 background_tab:"\u0424\u043E\u043D",
 block_tab:"\u0411\u043B\u043E\u043A",
 box_tab:"Box",
-border_tab:"\u0413\u0440\u0430\u043D\u0438\u0446\u044F",
+border_tab:"\u0420\u0430\u043C\u043A\u0430",
 list_tab:"\u0421\u043F\u0438\u0441\u043E\u043A",
 positioning_tab:"\u041F\u043E\u0437\u0438\u0446\u0456\u043E\u043D\u0443\u0432\u0430\u043D\u043D\u044F",
 text_props:"\u0422\u0435\u043A\u0441\u0442",
@@ -15,32 +15,32 @@ text_weight:"\u0422\u043E\u0432\u0449\u0438\u043D\u0430",
 text_style:"\u0421\u0442\u0438\u043B\u044C",
 text_variant:"Variant",
 text_lineheight:"\u0412\u0438\u0441\u043E\u0442\u0430 \u0440\u044F\u0434\u043A\u0443",
-text_case:"Case",
+text_case:"\u0420\u0435\u0433\u0456\u0441\u0442\u0440",
 text_color:"\u041A\u043E\u043B\u0456\u0440",
 text_decoration:"\u041E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u043D\u044F",
-text_overline:"\u0432\u0435\u0440\u0445\u043D\u044F \u0440\u0438\u0441\u043A\u0430",
-text_underline:"\u043D\u0438\u0436\u043D\u044F \u0440\u0438\u0441\u043A\u0430",
-text_striketrough:"\u0437\u0430\u043A\u0440\u0435\u0441\u043B\u0435\u043D\u0438\u0439",
-text_blink:"\u043C\u0435\u0440\u0435\u0445\u0442\u0456\u043D\u043D\u044F",
-text_none:"\u043D\u0456\u0447\u043E\u0433\u043E",
+text_overline:"\u0412\u0435\u0440\u0445\u043D\u044F \u0440\u0438\u0441\u043A\u0430",
+text_underline:"\u041D\u0438\u0436\u043D\u044F \u0440\u0438\u0441\u043A\u0430",
+text_striketrough:"\u0417\u0430\u043A\u0440\u0435\u0441\u043B\u0435\u043D\u0438\u0439",
+text_blink:"\u041C\u0435\u0440\u0435\u0445\u0442\u0456\u043D\u043D\u044F",
+text_none:"\u041D\u0456\u0447\u043E\u0433\u043E",
 background_color:"\u041A\u043E\u043B\u0456\u0440 \u0444\u043E\u043D\u0443",
 background_image:"\u0424\u043E\u043D\u043E\u0432\u0435 \u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F",
 background_repeat:"\u041F\u043E\u0432\u0442\u043E\u0440",
-background_attachment:"Attachment",
+background_attachment:"\u0412\u043A\u043B\u0430\u0434\u0435\u043D\u043D\u044F",
 background_hpos:"\u0413\u043E\u0440\u0438\u0437\u043E\u043D\u0442\u0430\u043B\u044C\u043D\u0430 \u043F\u043E\u0437\u0438\u0446\u0456\u044F",
 background_vpos:"\u0412\u0435\u0440\u0442\u0438\u043A\u0430\u043B\u044C\u043D\u0430 \u043F\u043E\u0437\u0438\u0446\u0456\u044F",
 block_wordspacing:"\u0412\u0456\u0434\u0441\u0442\u0443\u043F\u0438 \u043C\u0456\u0436 \u0441\u043B\u043E\u0432\u0430\u043C\u0438",
 block_letterspacing:"\u0412\u0456\u0434\u0441\u0442\u0443\u043F\u0438 \u043C\u0456\u0436 \u043B\u0456\u0442\u0435\u0440\u0430\u043C\u0438",
 block_vertical_alignment:"\u0412\u0435\u0440\u0442\u0438\u043A\u0430\u043B\u044C\u043D\u0435 \u0432\u0438\u0440\u0456\u0432\u043D\u044E\u0432\u0430\u043D\u043D\u044F",
 block_text_align:"\u0412\u0438\u0440\u0456\u0432\u043D\u044E\u0432\u0430\u043D\u043D\u044F \u0442\u0435\u043A\u0441\u0442\u0443",
-block_text_indent:"Text indent",
-block_whitespace:"Whitespace",
-block_display:"Display",
+block_text_indent:"\u0412\u0456\u0434\u0441\u0442\u0443\u043F",
+block_whitespace:"\u041F\u0440\u043E\u0431\u0456\u043B",
+block_display:"\u041F\u043E\u043A\u0430\u0437",
 box_width:"\u0428\u0438\u0440\u0438\u043D\u0430",
 box_height:"\u0412\u0438\u0441\u043E\u0442\u0430",
-box_float:"Float",
-box_clear:"Clear",
-padding:"Padding",
+box_float:"\u041F\u043B\u0430\u0432\u0430\u043D\u043D\u044F",
+box_clear:"\u041E\u0447\u0438\u0441\u0442\u043A\u0430",
+padding:"\u0412\u043D\u0443\u0442\u0440\u0456\u0448\u043D\u0456\u0439 \u0432\u0456\u0434\u0441\u0442\u0443\u043F",
 same:"\u041E\u0434\u043D\u0430\u043A\u043E\u0435 \u0434\u043B\u044F \u0432\u0441\u0456\u0445",
 top:"\u0412\u0433\u043E\u0440\u0443",
 right:"\u041F\u0440\u0430\u0432\u043E\u0440\u0443\u0447",
@@ -52,12 +52,12 @@ width:"\u0428\u0438\u0440\u0438\u043D\u0430",
 height:"\u0412\u0438\u0441\u043E\u0442\u0430",
 color:"\u041A\u043E\u043B\u0456\u0440",
 list_type:"\u0422\u0438\u043F",
-bullet_image:"Bullet image",
+bullet_image:"\u0417\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F \u0437\u043D\u0430\u0447\u043A\u0430 \u0432 \u0441\u043F\u0438\u0441\u043A\u0443",
 position:"\u041F\u043E\u0437\u0438\u0446\u0456\u044F",
 positioning_type:"\u0422\u0438\u043F",
 visibility:"\u0412\u0438\u0434\u0438\u043C\u0456\u0441\u0442\u044C",
-zindex:"Z-index",
-overflow:"Overflow",
-placement:"Placement",
-clip:"Clip"
+zindex:"Z-\u0456\u043D\u0434\u0435\u043A\u0441",
+overflow:"\u041F\u0435\u0440\u0435\u043F\u043E\u0432\u043D\u0435\u043D\u043D\u044F",
+placement:"\u0420\u043E\u0437\u043C\u0456\u0449\u0435\u043D\u043D\u044F",
+clip:"\u041E\u0431\u0440\u0456\u0437\u0430\u043D\u043D\u044F"
 });

data/public/javascripts/tiny_mce/plugins/style/langs/ur_dlg.js

@@ -0,0 +1,63 @@
+tinyMCE.addI18n('ur.style_dlg',{
+title:"Edit CSS Style",
+apply:"Apply",
+text_tab:"Text",
+background_tab:"Background",
+block_tab:"Block",
+box_tab:"Box",
+border_tab:"Border",
+list_tab:"List",
+positioning_tab:"Positioning",
+text_props:"Text",
+text_font:"Font",
+text_size:"Size",
+text_weight:"Weight",
+text_style:"Style",
+text_variant:"Variant",
+text_lineheight:"Line height",
+text_case:"Case",
+text_color:"Color",
+text_decoration:"Decoration",
+text_overline:"overline",
+text_underline:"underline",
+text_striketrough:"strikethrough",
+text_blink:"blink",
+text_none:"none",
+background_color:"Background color",
+background_image:"Background image",
+background_repeat:"Repeat",
+background_attachment:"Attachment",
+background_hpos:"Horizontal position",
+background_vpos:"Vertical position",
+block_wordspacing:"Word spacing",
+block_letterspacing:"Letter spacing",
+block_vertical_alignment:"Vertical alignment",
+block_text_align:"Text align",
+block_text_indent:"Text indent",
+block_whitespace:"Whitespace",
+block_display:"Display",
+box_width:"Width",
+box_height:"Height",
+box_float:"Float",
+box_clear:"Clear",
+padding:"Padding",
+same:"Same for all",
+top:"Top",
+right:"Right",
+bottom:"Bottom",
+left:"Left",
+margin:"Margin",
+style:"Style",
+width:"Width",
+height:"Height",
+color:"Color",
+list_type:"Type",
+bullet_image:"Bullet image",
+position:"Position",
+positioning_type:"Type",
+visibility:"Visibility",
+zindex:"Z-index",
+overflow:"Overflow",
+placement:"Placement",
+clip:"Clip"
+});

data/public/javascripts/tiny_mce/plugins/style/langs/zu_dlg.js

@@ -0,0 +1,63 @@
+tinyMCE.addI18n('zu.style_dlg',{
+title:"\u7F16\u8F91CSS\u6837\u5F0F\u8868",
+apply:"\u5E94\u7528",
+text_tab:"\u6587\u5B57",
+background_tab:"\u80CC\u666F",
+block_tab:"\u5757",
+box_tab:"\u7BB1\u578B",
+border_tab:"\u8FB9\u6846",
+list_tab:"\u5217\u8868",
+positioning_tab:"\u4F4D\u7F6E",
+text_props:"\u6587\u5B57",
+text_font:"\u5B57\u4F53",
+text_size:"\u5C3A\u5BF8",
+text_weight:"\u5BBD\u5EA6",
+text_style:"\u6837\u5F0F",
+text_variant:"\u53D8\u4F53",
+text_lineheight:"\u884C\u9AD8",
+text_case:"\u5B57\u4F53",
+text_color:"\u989C\u8272",
+text_decoration:"\u4FEE\u9970",
+text_overline:"\u4E0A\u5212\u7EBF",
+text_underline:"\u5E95\u7EBF",
+text_striketrough:"\u5220\u9664\u7EBF",
+text_blink:"\u95EA\u70C1",
+text_none:"\u65E0",
+background_color:"\u80CC\u666F\u989C\u8272",
+background_image:"\u80CC\u666F\u56FE\u7247",
+background_repeat:"\u91CD\u590D",
+background_attachment:"\u9644\u4EF6",
+background_hpos:"\u5782\u76F4\u4F4D\u7F6E",
+background_vpos:"\u6C34\u51C6\u4F4D\u7F6E",
+block_wordspacing:"\u5355\u5B57\u95F4\u8DDD",
+block_letterspacing:"\u5B57\u5143\u95F4\u8DDD",
+block_vertical_alignment:"\u6C34\u51C6\u5BF9\u9F50\u65B9\u5F0F",
+block_text_align:"\u6587\u5B57\u5BF9\u9F50",
+block_text_indent:"\u6587\u5B57\u7F29\u6392",
+block_whitespace:"\u7A7A\u767D",
+block_display:"\u663E\u793A\u65B9\u5F0F",
+box_width:"\u5BBD\u5EA6",
+box_height:"\u9AD8\u5EA6",
+box_float:"\u6D6E\u52A8",
+box_clear:"\u6E05\u9664",
+padding:"\u7559\u767D",
+same:"\u5168\u90E8\u4E00\u6837",
+top:"\u4E0A\u65B9",
+right:"\u9760\u53F3",
+bottom:"\u4E0B\u65B9",
+left:"\u9760\u5DE6",
+margin:"\u8FB9\u754C",
+style:"\u6837\u5F0F",
+width:"\u5BBD\u5EA6",
+height:"\u9AD8\u5EA6",
+color:"\u989C\u8272",
+list_type:"\u7C7B\u578B",
+bullet_image:"\u9879\u76EE\u56FE\u793A",
+position:"\u56FE\u793A\u4F4D\u7F6E",
+positioning_type:"\u7C7B\u578B",
+visibility:"\u53EF\u89C1\u6027",
+zindex:"Z\u8F74\u6DF1\u5EA6",
+overflow:"\u6EA2\u51FA",
+placement:"\u5E03\u7F6E",
+clip:"\u526A\u8F91"
+});

data/public/javascripts/tiny_mce/plugins/style/props.htm

@@ -40,7 +40,7 @@
 					<tr>
 						<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
 						<td>&nbsp;</td>
-      <td><select id="text_size_measurement" name="text_size_measurement"></select></td>
+						<td><select id="text_size_measurement" name="text_size_measurement"></select></td>
 					</tr>
 				</table>
 			</td>
@@ -710,15 +710,11 @@
 
 <div class="mceActionPanel">
 	<div style="float: left">
-		<div style="float: left"><input type="submit" id="insert" name="insert" value="{#update}" /></div>
-
-		<div style="float: left">&nbsp;<input type="button" class="button" id="apply" name="apply" value="{#style_dlg.apply}" onClick="applyAction();" /></div>
-		<br style="clear: both" />
+		<input type="submit" id="insert" name="insert" value="{#update}" />
+		<input type="button" class="button" id="apply" name="apply" value="{#style_dlg.apply}" onClick="applyAction();" />
 	</div>
 
-	<div style="float: right">
-		<input type="button" id="cancel" name="cancel" value="{#cancel}" onClick="tinyMCEPopup.close();" />
-	</div>
+	<input type="button" id="cancel" name="cancel" value="{#cancel}" onClick="tinyMCEPopup.close();" />
 </div>
 </form>
 

data/public/javascripts/tiny_mce/plugins/tabfocus/editor_plugin.js

@@ -1 +1 @@
-(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(i){o=c.getParent(l.id,"form");n=o.elements;if(o){d(n,function(s,r){if(s.id==l.id){j=r;return false}});if(i>0){for(m=j+1;m<n.length;m++){if(n[m].type!="hidden"){return n[m]}}}else{for(m=j-1;m>=0;m--){if(n[m].type!="hidden"){return n[m]}}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(l=tinymce.EditorManager.get(n.id||n.name)){l.focus()}else{window.setTimeout(function(){window.focus();n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}f.onInit.add(function(){d(c.select("a:first,a:last",f.getContainer()),function(i){a.add(i,"focus",function(){f.focus()})})})},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
+(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(i){o=c.getParent(l.id,"form");n=o.elements;if(o){d(n,function(s,r){if(s.id==l.id){j=r;return false}});if(i>0){for(m=j+1;m<n.length;m++){if(n[m].type!="hidden"){return n[m]}}}else{for(m=j-1;m>=0;m--){if(n[m].type!="hidden"){return n[m]}}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(l=tinymce.get(n.id||n.name)){l.focus()}else{window.setTimeout(function(){window.focus();n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}f.onInit.add(function(){d(c.select("a:first,a:last",f.getContainer()),function(i){a.add(i,"focus",function(){f.focus()})})})},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();

data/public/javascripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js

@@ -1,8 +1,11 @@
 /**
- * $Id: editor_plugin_src.js 787 2008-04-10 11:40:57Z spocke $
+ * editor_plugin_src.js
  *
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
  */
 
 (function() {
@@ -68,7 +71,7 @@
 					}
 
 					if (el) {
-						if (ed = tinymce.EditorManager.get(el.id || el.name))
+						if (ed = tinymce.get(el.id || el.name))
 							ed.focus();
 						else
 							window.setTimeout(function() {window.focus();el.focus();}, 10);

data/public/javascripts/tiny_mce/plugins/table/cell.htm

@@ -170,13 +170,8 @@
 				</select>
 			</div>
 
-			<div style="float: left">
-				<div><input type="submit" id="insert" name="insert" value="{#update}" /></div>
-			</div>
-
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-			</div>
+			<input type="submit" id="insert" name="insert" value="{#update}" />
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
 		</div>
 	</form>
 </body>

data/public/javascripts/tiny_mce/plugins/table/editor_plugin.js

@@ -1 +1 @@
-(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.TablePlugin",{init:function(b,c){var d=this;d.editor=b;d.url=c;a([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(e){b.addButton(e[0],{title:e[1],cmd:e[2],ui:e[3]})});if(b.getParam("inline_styles")){b.onPreProcess.add(function(e,g){var f=e.dom;a(f.select("table",g.node),function(i){var h;if(h=f.getAttrib(i,"width")){f.setStyle(i,"width",h);f.setAttrib(i,"width")}if(h=f.getAttrib(i,"height")){f.setStyle(i,"height",h);f.setAttrib(i,"height")}})})}b.onInit.add(function(){if(!tinymce.isIE&&b.getParam("forced_root_block")){function e(){var f=b.getBody().lastChild;if(f&&f.nodeName=="TABLE"){b.dom.add(b.getBody(),"p",null,'<br mce_bogus="1" />')}}b.onKeyUp.add(e);b.onSetContent.add(e);b.onVisualAid.add(e);b.onPreProcess.add(function(f,h){var g=h.node.lastChild;if(g&&g.childNodes.length==1&&g.firstChild.nodeName=="BR"){f.dom.remove(g)}});e()}if(b&&b.plugins.contextmenu){b.plugins.contextmenu.onContextMenu.add(function(h,f,j){var k,i=b.selection,g=i.getNode()||b.getBody();if(b.dom.getParent(j,"td")||b.dom.getParent(j,"th")){f.removeAll();if(g.nodeName=="A"&&!b.dom.getAttrib(g,"name")){f.add({title:"advanced.link_desc",icon:"link",cmd:b.plugins.advlink?"mceAdvLink":"mceLink",ui:true});f.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});f.addSeparator()}if(g.nodeName=="IMG"&&g.className.indexOf("mceItem")==-1){f.add({title:"advanced.image_desc",icon:"image",cmd:b.plugins.advimage?"mceAdvImage":"mceImage",ui:true});f.addSeparator()}f.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",ui:true,value:{action:"insert"}});f.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable",ui:true});f.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete",ui:true});f.addSeparator();k=f.addMenu({title:"table.cell"});k.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps",ui:true});k.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells",ui:true});k.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells",ui:true});k=f.addMenu({title:"table.row"});k.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps",ui:true});k.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});k.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});k.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});k.addSeparator();k.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});k.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});k.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"});k.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"});k=f.addMenu({title:"table.col"});k.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});k.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});k.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{f.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",ui:true})}})}});b.onKeyDown.add(function(f,g){if(g.keyCode==9&&f.dom.getParent(f.selection.getNode(),"TABLE")){if(!tinymce.isGecko&&!tinymce.isOpera){tinyMCE.execInstanceCommand(f.editorId,"mceTableMoveToNextRow",true);return tinymce.dom.Event.cancel(g)}f.undoManager.add()}});if(!tinymce.isIE){if(b.getParam("table_selection",true)){b.onClick.add(function(f,g){g=g.target;if(g.nodeName==="TABLE"){f.selection.select(g)}})}}b.onNodeChange.add(function(f,e,h){var g=f.dom.getParent(h,"td,th,caption");e.setActive("table",h.nodeName==="TABLE"||!!g);if(g&&g.nodeName==="CAPTION"){g=null}e.setDisabled("delete_table",!g);e.setDisabled("delete_col",!g);e.setDisabled("delete_table",!g);e.setDisabled("delete_row",!g);e.setDisabled("col_after",!g);e.setDisabled("col_before",!g);e.setDisabled("row_after",!g);e.setDisabled("row_before",!g);e.setDisabled("row_props",!g);e.setDisabled("cell_props",!g);e.setDisabled("split_cells",!g||(parseInt(f.dom.getAttrib(g,"colspan","1"))<2&&parseInt(f.dom.getAttrib(g,"rowspan","1"))<2));e.setDisabled("merge_cells",!g)});if(!tinymce.isIE){b.onBeforeSetContent.add(function(e,f){if(f.initial){f.content=f.content.replace(/<(td|th)([^>]+|)>\s*<\/(td|th)>/g,tinymce.isOpera?"<$1$2>&nbsp;</$1>":'<$1$2><br mce_bogus="1" /></$1>')}})}},execCommand:function(f,e,g){var d=this.editor,c;switch(f){case"mceTableMoveToNextRow":case"mceInsertTable":case"mceTableRowProps":case"mceTableCellProps":case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":case"mceTableDelete":d.execCommand("mceBeginUndoLevel");this._doExecCommand(f,e,g);d.execCommand("mceEndUndoLevel");return true}return false},getInfo:function(){return{longname:"Tables",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_doExecCommand:function(r,Z,ae){var V=this.editor,au=V,g=this.url;var n=V.selection.getNode();var W=V.dom.getParent(n,"tr");var aq=V.dom.getParent(n,"td,th");var F=V.dom.getParent(n,"table");var k=V.contentWindow.document;var av=F?F.getAttribute("border"):"";if(W&&aq==null){aq=W.cells[0]}function ap(y,x){for(var ax=0;ax<y.length;ax++){if(y[ax].length>0&&ap(y[ax],x)){return true}if(y[ax]==x){return true}}return false}function aj(x,i){var y;ad=e(F);x=x||0;i=i||0;x=Math.max(o.cellindex+x,0);i=Math.max(o.rowindex+i,0);V.execCommand("mceRepaint");y=d(ad,i,x);if(y){V.selection.select(y.firstChild||y);V.selection.collapse(1)}}function ah(){var i=k.createElement("td");if(!tinymce.isIE){i.innerHTML='<br mce_bogus="1"/>'}}function j(y){var x=V.dom.getAttrib(y,"colspan");var i=V.dom.getAttrib(y,"rowspan");x=x==""?1:parseInt(x);i=i==""?1:parseInt(i);return{colspan:x,rowspan:i}}function al(ax,az){var i,ay;for(ay=0;ay<ax.length;ay++){for(i=0;i<ax[ay].length;i++){if(ax[ay][i]==az){return{cellindex:i,rowindex:ay}}}}return null}function d(x,y,i){if(x[y]&&x[y][i]){return x[y][i]}return null}function A(aC,ax){var az=[],y=0,aA,ay,ax,aB;for(aA=0;aA<aC.rows.length;aA++){for(ay=0;ay<aC.rows[aA].cells.length;ay++,y++){az[y]=aC.rows[aA].cells[ay]}}for(aA=0;aA<az.length;aA++){if(az[aA]==ax){if(aB=az[aA+1]){return aB}}}}function e(aE){var i=[],aF=aE.rows,aC,aB,ay,az,aD,ax,aA;for(aB=0;aB<aF.length;aB++){for(aC=0;aC<aF[aB].cells.length;aC++){ay=aF[aB].cells[aC];az=j(ay);for(aD=aC;i[aB]&&i[aB][aD];aD++){}for(aA=aB;aA<aB+az.rowspan;aA++){if(!i[aA]){i[aA]=[]}for(ax=aD;ax<aD+az.colspan;ax++){i[aA][ax]=ay}}}}return i}function m(aG,aD,ay,ax){var y=e(aG),aF=al(y,ay);var aH,aC;if(ax.cells.length!=aD.childNodes.length){aH=aD.childNodes;aC=null;for(var aE=0;ay=d(y,aF.rowindex,aE);aE++){var aA=true;var aB=j(ay);if(ap(aH,ay)){ax.childNodes[aE]._delete=true}else{if((aC==null||ay!=aC)&&aB.colspan>1){for(var az=aE;az<aE+ay.colSpan;az++){ax.childNodes[az]._delete=true}}}if((aC==null||ay!=aC)&&aB.rowspan>1){ay.rowSpan=aB.rowspan+1}aC=ay}B(F)}}function O(x,i){while((x=x.previousSibling)!=null){if(x.nodeName==i){return x}}return null}function af(ax,ay){var x=ay.split(",");while((ax=ax.nextSibling)!=null){for(var y=0;y<x.length;y++){if(ax.nodeName.toLowerCase()==x[y].toLowerCase()){return ax}}}return null}function B(ax){if(ax.rows==0){return}var y=ax.rows[0];do{var x=af(y,"TR");if(y._delete){y.parentNode.removeChild(y);continue}var ay=y.cells[0];if(ay.cells>1){do{var i=af(ay,"TD,TH");if(ay._delete){ay.parentNode.removeChild(ay)}}while((ay=i)!=null)}}while((y=x)!=null)}function p(ax,aA,az){ax.rowSpan=1;var x=af(aA,"TR");for(var ay=1;ay<az&&x;ay++){var y=k.createElement("td");if(!tinymce.isIE){y.innerHTML='<br mce_bogus="1"/>'}if(tinymce.isIE){x.insertBefore(y,x.cells(ax.cellIndex))}else{x.insertBefore(y,x.cells[ax.cellIndex])}x=af(x,"TR")}}function S(aF,aH,aB){var y=e(aH);var ax=aB.cloneNode(false);var aG=al(y,aB.cells[0]);var aC=null;var aA=V.dom.getAttrib(aH,"border");var az=null;for(var aE=0;az=d(y,aG.rowindex,aE);aE++){var aD=null;if(aC!=az){for(var ay=0;ay<aB.cells.length;ay++){if(az==aB.cells[ay]){aD=az.cloneNode(true);break}}}if(aD==null){aD=aF.createElement("td");if(!tinymce.isIE){aD.innerHTML='<br mce_bogus="1"/>'}}aD.colSpan=1;aD.rowSpan=1;ax.appendChild(aD);aC=az}return ax}switch(r){case"mceTableMoveToNextRow":var L=A(F,aq);if(!L){V.execCommand("mceTableInsertRowAfter",aq);L=A(F,aq)}V.selection.select(L);V.selection.collapse(true);return true;case"mceTableRowProps":if(W==null){return true}if(Z){V.windowManager.open({url:g+"/row.htm",width:400+parseInt(V.getLang("table.rowprops_delta_width",0)),height:295+parseInt(V.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:g})}return true;case"mceTableCellProps":if(aq==null){return true}if(Z){V.windowManager.open({url:g+"/cell.htm",width:400+parseInt(V.getLang("table.cellprops_delta_width",0)),height:295+parseInt(V.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:g})}return true;case"mceInsertTable":if(Z){V.windowManager.open({url:g+"/table.htm",width:400+parseInt(V.getLang("table.table_delta_width",0)),height:320+parseInt(V.getLang("table.table_delta_height",0)),inline:1},{plugin_url:g,action:ae?ae.action:0})}return true;case"mceTableDelete":var G=V.dom.getParent(V.selection.getNode(),"table");if(G){G.parentNode.removeChild(G);V.execCommand("mceRepaint")}return true;case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":if(!F){return true}if(W&&F!=W.parentNode){F=W.parentNode}if(F&&W){switch(r){case"mceTableCutRow":if(!W||!aq){return true}V.tableRowClipboard=S(k,F,W);V.execCommand("mceTableDeleteRow");break;case"mceTableCopyRow":if(!W||!aq){return true}V.tableRowClipboard=S(k,F,W);break;case"mceTablePasteRowBefore":if(!W||!aq){return true}var v=V.tableRowClipboard.cloneNode(true);var h=O(W,"TR");if(h!=null){m(F,h,h.cells[0],v)}W.parentNode.insertBefore(v,W);break;case"mceTablePasteRowAfter":if(!W||!aq){return true}var X=af(W,"TR");var v=V.tableRowClipboard.cloneNode(true);m(F,W,aq,v);if(X==null){W.parentNode.appendChild(v)}else{X.parentNode.insertBefore(v,X)}break;case"mceTableInsertRowBefore":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);var v=k.createElement("tr");var u=null;o.rowindex--;if(o.rowindex<0){o.rowindex=0}for(var ac=0;aq=d(ad,o.rowindex,ac);ac++){if(aq!=u){var E=j(aq);if(E.rowspan==1){var J=k.createElement("td");if(!tinymce.isIE){J.innerHTML='<br mce_bogus="1"/>'}J.colSpan=aq.colSpan;v.appendChild(J)}else{aq.rowSpan=E.rowspan+1}u=aq}}W.parentNode.insertBefore(v,W);aj(0,1);break;case"mceTableInsertRowAfter":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);var v=k.createElement("tr");var u=null;for(var ac=0;aq=d(ad,o.rowindex,ac);ac++){if(aq!=u){var E=j(aq);if(E.rowspan==1){var J=k.createElement("td");if(!tinymce.isIE){J.innerHTML='<br mce_bogus="1"/>'}J.colSpan=aq.colSpan;v.appendChild(J)}else{aq.rowSpan=E.rowspan+1}u=aq}}if(v.hasChildNodes()){var X=af(W,"TR");if(X){X.parentNode.insertBefore(v,X)}else{F.appendChild(v)}}aj(0,1);break;case"mceTableDeleteRow":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);if(ad.length==1&&F.nodeName=="TBODY"){V.dom.remove(V.dom.getParent(F,"table"));return true}var D=W.cells;var X=af(W,"TR");for(var ac=0;ac<D.length;ac++){if(D[ac].rowSpan>1){var J=D[ac].cloneNode(true);var E=j(D[ac]);J.rowSpan=E.rowspan-1;var ak=X.cells[ac];if(ak==null){X.appendChild(J)}else{X.insertBefore(J,ak)}}}var u=null;for(var ac=0;aq=d(ad,o.rowindex,ac);ac++){if(aq!=u){var E=j(aq);if(E.rowspan>1){aq.rowSpan=E.rowspan-1}else{W=aq.parentNode;if(W.parentNode){W._delete=true}}u=aq}}B(F);aj(0,-1);break;case"mceTableInsertColBefore":if(!W||!aq){return true}var ad=e(V.dom.getParent(F,"table"));var o=al(ad,aq);var u=null;for(var aa=0;aq=d(ad,aa,o.cellindex);aa++){if(aq!=u){var E=j(aq);if(E.colspan==1){var J=k.createElement(aq.nodeName);if(!tinymce.isIE){J.innerHTML='<br mce_bogus="1"/>'}J.rowSpan=aq.rowSpan;aq.parentNode.insertBefore(J,aq)}else{aq.colSpan++}u=aq}}aj();break;case"mceTableInsertColAfter":if(!W||!aq){return true}var ad=e(V.dom.getParent(F,"table"));var o=al(ad,aq);var u=null;for(var aa=0;aq=d(ad,aa,o.cellindex);aa++){if(aq!=u){var E=j(aq);if(E.colspan==1){var J=k.createElement(aq.nodeName);if(!tinymce.isIE){J.innerHTML='<br mce_bogus="1"/>'}J.rowSpan=aq.rowSpan;var ak=af(aq,"TD,TH");if(ak==null){aq.parentNode.appendChild(J)}else{ak.parentNode.insertBefore(J,ak)}}else{aq.colSpan++}u=aq}}aj(1);break;case"mceTableDeleteCol":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);var u=null;if((ad.length>1&&ad[0].length<=1)&&F.nodeName=="TBODY"){V.dom.remove(V.dom.getParent(F,"table"));return true}for(var aa=0;aq=d(ad,aa,o.cellindex);aa++){if(aq!=u){var E=j(aq);if(E.colspan>1){aq.colSpan=E.colspan-1}else{if(aq.parentNode){aq.parentNode.removeChild(aq)}}u=aq}}aj(-1);break;case"mceTableSplitCells":if(!W||!aq){return true}var l=j(aq);var C=l.colspan;var H=l.rowspan;if(C>1||H>1){aq.colSpan=1;for(var am=1;am<C;am++){var J=k.createElement("td");if(!tinymce.isIE){J.innerHTML='<br mce_bogus="1"/>'}W.insertBefore(J,af(aq,"TD,TH"));if(H>1){p(J,W,H)}}p(aq,W,H)}F=V.dom.getParent(V.selection.getNode(),"table");break;case"mceTableMergeCells":var ao=[];var R=V.selection.getSel();var ad=e(F);if(tinymce.isIE||R.rangeCount==1){if(Z){var t=j(aq);V.windowManager.open({url:g+"/merge_cells.htm",width:240+parseInt(V.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(V.getLang("table.merge_cells_delta_height",0)),inline:1},{action:"update",numcols:t.colspan,numrows:t.rowspan,plugin_url:g});return true}else{var U=parseInt(ae.numrows);var c=parseInt(ae.numcols);var o=al(ad,aq);if((""+U)=="NaN"){U=1}if((""+c)=="NaN"){c=1}var b=F.rows;for(var aa=o.rowindex;aa<ad.length;aa++){var ag=[];for(var ac=o.cellindex;ac<ad[aa].length;ac++){var f=d(ad,aa,ac);if(f&&!ap(ao,f)&&!ap(ag,f)){var N=al(ad,f);if(N.cellindex<o.cellindex+c&&N.rowindex<o.rowindex+U){ag[ag.length]=f}}}if(ag.length>0){ao[ao.length]=ag}var f=d(ad,o.rowindex,o.cellindex);a(au.dom.select("br",f),function(y,x){if(x>0&&au.dom.getAttrib("mce_bogus")){au.dom.remove(y)}})}}}else{var D=[];var R=V.selection.getSel();var Y=null;var an=null;var z=-1,aw=-1,w,at;if(R.rangeCount<2){return true}for(var am=0;am<R.rangeCount;am++){var ai=R.getRangeAt(am);var aq=ai.startContainer.childNodes[ai.startOffset];if(!aq){break}if(aq.nodeName=="TD"||aq.nodeName=="TH"){D[D.length]=aq}}var b=F.rows;for(var aa=0;aa<b.length;aa++){var ag=[];for(var ac=0;ac<b[aa].cells.length;ac++){var f=b[aa].cells[ac];for(var am=0;am<D.length;am++){if(f==D[am]){ag[ag.length]=f}}}if(ag.length>0){ao[ao.length]=ag}}var an=[];var Y=null;for(var aa=0;aa<ad.length;aa++){for(var ac=0;ac<ad[aa].length;ac++){ad[aa][ac]._selected=false;for(var am=0;am<D.length;am++){if(ad[aa][ac]==D[am]){if(z==-1){z=ac;aw=aa}w=ac;at=aa;ad[aa][ac]._selected=true}}}}for(var aa=aw;aa<=at;aa++){for(var ac=z;ac<=w;ac++){if(!ad[aa][ac]._selected){alert("Invalid selection for merge.");return true}}}}var s=1,q=1;var T=-1;for(var aa=0;aa<ao.length;aa++){var I=0;for(var ac=0;ac<ao[aa].length;ac++){var E=j(ao[aa][ac]);I+=E.colspan;if(T!=-1&&E.rowspan!=T){alert("Invalid selection for merge.");return true}T=E.rowspan}if(I>q){q=I}T=-1}var Q=-1;for(var ac=0;ac<ao[0].length;ac++){var M=0;for(var aa=0;aa<ao.length;aa++){var E=j(ao[aa][ac]);M+=E.rowspan;if(Q!=-1&&E.colspan!=Q){alert("Invalid selection for merge.");return true}Q=E.colspan}if(M>s){s=M}Q=-1}aq=ao[0][0];aq.rowSpan=s;aq.colSpan=q;for(var aa=0;aa<ao.length;aa++){for(var ac=0;ac<ao[aa].length;ac++){var P=ao[aa][ac].innerHTML;var K=P.replace(/[ \t\r\n]/g,"");if(K!="<br/>"&&K!="<br>"&&K!='<br mce_bogus="1"/>'&&(ac+aa>0)){aq.innerHTML+=P}if(ao[aa][ac]!=aq&&!ao[aa][ac]._deleted){var o=al(ad,ao[aa][ac]);var ar=ao[aa][ac].parentNode;ar.removeChild(ao[aa][ac]);ao[aa][ac]._deleted=true;if(!ar.hasChildNodes()){ar.parentNode.removeChild(ar);var ab=null;for(var ac=0;cellElm=d(ad,o.rowindex,ac);ac++){if(cellElm!=ab&&cellElm.rowSpan>1){cellElm.rowSpan--}ab=cellElm}if(aq.rowSpan>1){aq.rowSpan--}}}}}a(au.dom.select("br",aq),function(y,x){if(x>0&&au.dom.getAttrib(y,"mce_bogus")){au.dom.remove(y)}});break}F=V.dom.getParent(V.selection.getNode(),"table");V.addVisual(F);V.nodeChanged()}return true}return false}});tinymce.PluginManager.add("table",tinymce.plugins.TablePlugin)})();
+(function(b){var c=b.each;function a(E,D,H){var e,I,A,n;r();n=D.getParent(H.getStart(),"th,td");if(n){I=C(n);A=F();n=v(I.x,I.y)}function r(){var J=0;e=[];c(["thead","tbody","tfoot"],function(K){var L=D.select(K+" tr",E);c(L,function(M,N){N+=J;c(D.select("td,th",M),function(T,O){var P,Q,R,S;if(e[N]){while(e[N][O]){O++}}R=g(T,"rowspan");S=g(T,"colspan");for(Q=N;Q<N+R;Q++){if(!e[Q]){e[Q]=[]}for(P=O;P<O+S;P++){e[Q][P]={part:K,real:Q==N&&P==O,elm:T,rowspan:R,colspan:S}}}})});J+=L.length})}function v(J,L){var K;K=e[L];if(K){return K[J]}}function g(K,J){return parseInt(K.getAttribute(J)||1)}function h(J){return D.hasClass(J.elm,"mceSelected")||J==n}function j(){var J=[];c(E.rows,function(K){c(K.cells,function(L){if(D.hasClass(L,"mceSelected")||L==n.elm){J.push(K);return false}})});return J}function q(){var J=D.createRng();J.setStartAfter(E);J.setEndAfter(E);H.setRng(J);D.remove(E)}function d(J){var K;b.walk(J,function(M){var L;if(M.nodeType==3){c(D.getParents(M.parentNode,null,J).reverse(),function(N){N=N.cloneNode(false);if(!K){K=L=N}else{if(L){L.appendChild(N)}}L=N});if(L){L.innerHTML=b.isIE?"&nbsp;":'<br _mce_bogus="1" />'}return false}},"childNodes");J=J.cloneNode(false);J.rowSpan=J.colSpan=1;if(K){J.appendChild(K)}else{if(!b.isIE){J.innerHTML='<br _mce_bogus="1" />'}}return J}function p(){var J=D.createRng();c(D.select("tr",E),function(K){if(K.cells.length==0){D.remove(K)}});if(D.select("tr",E).length==0){J.setStartAfter(E);J.setEndAfter(E);H.setRng(J);D.remove(E);return}c(D.select("thead,tbody,tfoot",E),function(K){if(K.rows.length==0){D.remove(K)}});r();row=e[Math.min(e.length-1,I.y)];if(row){H.select(row[Math.min(row.length-1,I.x)].elm,true);H.collapse(true)}}function s(P,N,R,O){var M,K,J,L,Q;M=e[N][P].elm.parentNode;for(J=1;J<=R;J++){M=D.getNext(M,"tr");if(M){for(K=P;K>=0;K--){Q=e[N+J][K].elm;if(Q.parentNode==M){for(L=1;L<=O;L++){D.insertAfter(d(Q),Q)}break}}if(K==-1){for(L=1;L<=O;L++){M.insertBefore(d(M.cells[0]),M.cells[0])}}}}}function z(){c(e,function(J,K){c(J,function(M,L){var P,O,Q,N;if(h(M)){M=M.elm;P=g(M,"colspan");O=g(M,"rowspan");if(P>1||O>1){M.colSpan=M.rowSpan=1;for(N=0;N<P-1;N++){D.insertAfter(d(M),M)}s(L,K,O-1,P)}}})})}function o(R,O,U){var M,L,T,S,Q,N,P,J,R,K;if(R){pos=C(R);M=pos.x;L=pos.y;T=M+(O-1);S=L+(U-1)}else{M=I.x;L=I.y;T=A.x;S=A.y}P=v(M,L);J=v(T,S);if(P&&J&&P.part==J.part){z();r();P=v(M,L).elm;P.colSpan=(T-M)+1;P.rowSpan=(S-L)+1;for(N=L;N<=S;N++){for(Q=M;Q<=T;Q++){R=e[N][Q].elm;if(R!=P){K=b.grep(R.childNodes);c(K,function(W,V){if(W.nodeName!="BR"||V!=K.length-1){P.appendChild(W)}});D.remove(R)}}}p()}}function k(M){var J,O,L,N,P,Q,K,R;c(e,function(S,T){c(S,function(V,U){if(h(V)){V=V.elm;P=V.parentNode;Q=P.cloneNode(false);J=T;if(M){return false}}});if(M){return !J}});for(N=0;N<e[0].length;N++){O=e[J][N].elm;if(O!=L){if(!M){rowSpan=g(O,"rowspan");if(rowSpan>1){O.rowSpan=rowSpan+1;continue}}else{if(J>0&&e[J-1][N]){R=e[J-1][N].elm;rowSpan=g(R,"rowspan");if(rowSpan>1){R.rowSpan=rowSpan+1;continue}}}K=d(O);K.colSpan=O.colSpan;Q.appendChild(K);L=O}}if(Q.hasChildNodes()){if(!M){D.insertAfter(Q,P)}else{P.parentNode.insertBefore(Q,P)}}}function f(K){var L,J;c(e,function(M,N){c(M,function(P,O){if(h(P)){L=O;if(K){return false}}});if(K){return !L}});c(e,function(P,Q){var M=P[L].elm,N,O;if(M!=J){O=g(M,"colspan");N=g(M,"rowspan");if(O==1){if(!K){D.insertAfter(d(M),M);s(L,Q,N-1,O)}else{M.parentNode.insertBefore(d(M),M);s(L,Q,N-1,O)}}else{M.colSpan++}J=M}})}function m(){var J=[];c(e,function(K,L){c(K,function(N,M){if(h(N)&&b.inArray(J,M)===-1){c(e,function(Q){var O=Q[M].elm,P;P=g(O,"colspan");if(P>1){O.colSpan=P-1}else{D.remove(O)}});J.push(M)}})});p()}function l(){var K;function J(N){var M,O,L;M=D.getNext(N,"tr");c(N.cells,function(P){var Q=g(P,"rowspan");if(Q>1){P.rowSpan=Q-1;O=C(P);s(O.x,O.y,1,1)}});O=C(N.cells[0]);c(e[O.y],function(P){var Q;P=P.elm;if(P!=L){Q=g(P,"rowspan");if(Q<=1){D.remove(P)}else{P.rowSpan=Q-1}L=P}})}K=j();c(K.reverse(),function(L){J(L)});p()}function B(){var J=j();D.remove(J);p();return J}function G(){var J=j();c(J,function(L,K){J[K]=L.cloneNode(true)});return J}function w(L,K){var M=j(),J=M[K?0:M.length-1],N=J.cells.length;c(e,function(P){var O;N=0;c(P,function(R,Q){if(R.real){N+=R.colspan}if(R.elm.parentNode==J){O=1}});if(O){return false}});if(!K){L.reverse()}c(L,function(Q){var P=Q.cells.length,O;for(i=0;i<P;i++){O=Q.cells[i];O.colSpan=O.rowSpan=1}for(i=P;i<N;i++){Q.appendChild(d(Q.cells[P-1]))}for(i=N;i<P;i++){D.remove(Q.cells[i])}if(K){J.parentNode.insertBefore(Q,J)}else{D.insertAfter(Q,J)}})}function C(J){var K;c(e,function(L,M){c(L,function(O,N){if(O.elm==J){K={x:N,y:M};return false}});return !K});return K}function u(J){I=C(J)}function F(){var L,K,J;K=J=0;c(e,function(M,N){c(M,function(P,O){var R,Q;if(h(P)){P=e[N][O];if(O>K){K=O}if(N>J){J=N}if(P.real){R=P.colspan-1;Q=P.rowspan-1;if(R){if(O+R>K){K=O+R}}if(Q){if(N+Q>J){J=N+Q}}}}})});return{x:K,y:J}}function t(P){var M,L,R,Q,K,J,N,O;A=C(P);if(I&&A){M=Math.min(I.x,A.x);L=Math.min(I.y,A.y);R=Math.max(I.x,A.x);Q=Math.max(I.y,A.y);K=R;J=Q;for(y=L;y<=J;y++){P=e[y][M];if(!P.real){if(M-(P.colspan-1)<M){M-=P.colspan-1}}}for(x=M;x<=K;x++){P=e[L][x];if(!P.real){if(L-(P.rowspan-1)<L){L-=P.rowspan-1}}}for(y=L;y<=Q;y++){for(x=M;x<=R;x++){P=e[y][x];if(P.real){N=P.colspan-1;O=P.rowspan-1;if(N){if(x+N>K){K=x+N}}if(O){if(y+O>J){J=y+O}}}}}D.removeClass(D.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=L;y<=J;y++){for(x=M;x<=K;x++){D.addClass(e[y][x].elm,"mceSelected")}}}}b.extend(this,{deleteTable:q,split:z,merge:o,insertRow:k,insertCol:f,deleteCols:m,deleteRows:l,cutRows:B,copyRows:G,pasteRows:w,getPos:C,setStartCell:u,setEndCell:t})}b.create("tinymce.plugins.TablePlugin",{init:function(e,f){var d,j;function h(m){var l=e.selection,k=e.dom.getParent(m||l.getNode(),"table");if(k){return new a(k,e.dom,l)}}function g(){e.getBody().style.webkitUserSelect="";e.dom.removeClass(e.dom.select("td.mceSelected,th.mceSelected"),"mceSelected")}c([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(k){e.addButton(k[0],{title:k[1],cmd:k[2],ui:k[3]})});if(!b.isIE){e.onClick.add(function(k,l){l=l.target;if(l.nodeName==="TABLE"){k.selection.select(l)}})}e.onNodeChange.add(function(l,k,o){var m;o=l.selection.getStart();m=l.dom.getParent(o,"td,th,caption");k.setActive("table",o.nodeName==="TABLE"||!!m);if(m&&m.nodeName==="CAPTION"){m=0}k.setDisabled("delete_table",!m);k.setDisabled("delete_col",!m);k.setDisabled("delete_table",!m);k.setDisabled("delete_row",!m);k.setDisabled("col_after",!m);k.setDisabled("col_before",!m);k.setDisabled("row_after",!m);k.setDisabled("row_before",!m);k.setDisabled("row_props",!m);k.setDisabled("cell_props",!m);k.setDisabled("split_cells",!m);k.setDisabled("merge_cells",!m)});e.onInit.add(function(l){var k,o,p=l.dom,m;d=l.windowManager;l.onMouseDown.add(function(q,r){if(r.button!=2){g();o=p.getParent(r.target,"td,th");k=p.getParent(o,"table")}});p.bind(l.getDoc(),"mouseover",function(t){var r,q,s=t.target;if(o&&(m||s!=o)&&(s.nodeName=="TD"||s.nodeName=="TH")){q=p.getParent(s,"table");if(q==k){if(!m){m=h(q);m.setStartCell(o);l.getBody().style.webkitUserSelect="none"}m.setEndCell(s)}r=l.selection.getSel();if(r.removeAllRanges){r.removeAllRanges()}else{r.empty()}t.preventDefault()}});l.onMouseUp.add(function(z,A){var r,t=z.selection,B,C=t.getSel(),q,u,s,w;if(o){if(m){z.getBody().style.webkitUserSelect=""}function v(D,F){var E=new b.dom.TreeWalker(D,D);do{if(D.nodeType==3&&b.trim(D.nodeValue).length!=0){if(F){r.setStart(D,0)}else{r.setEnd(D,D.nodeValue.length)}return}if(D.nodeName=="BR"){if(F){r.setStartBefore(D)}else{r.setEndBefore(D)}return}}while(D=(F?E.next():E.prev()))}B=p.select("td.mceSelected,th.mceSelected");if(B.length>0){r=p.createRng();u=B[0];w=B[B.length-1];v(u,1);q=new b.dom.TreeWalker(u,p.getParent(B[0],"table"));do{if(u.nodeName=="TD"||u.nodeName=="TH"){if(!p.hasClass(u,"mceSelected")){break}s=u}}while(u=q.next());v(s);t.setRng(r)}z.nodeChanged();o=m=k=null}});l.onKeyUp.add(function(q,r){g()});if(l&&l.plugins.contextmenu){l.plugins.contextmenu.onContextMenu.add(function(s,q,u){var v,t=l.selection,r=t.getNode()||l.getBody();if(l.dom.getParent(u,"td")||l.dom.getParent(u,"th")){q.removeAll();if(r.nodeName=="A"&&!l.dom.getAttrib(r,"name")){q.add({title:"advanced.link_desc",icon:"link",cmd:l.plugins.advlink?"mceAdvLink":"mceLink",ui:true});q.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});q.addSeparator()}if(r.nodeName=="IMG"&&r.className.indexOf("mceItem")==-1){q.add({title:"advanced.image_desc",icon:"image",cmd:l.plugins.advimage?"mceAdvImage":"mceImage",ui:true});q.addSeparator()}q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});q.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});q.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});q.addSeparator();v=q.addMenu({title:"table.cell"});v.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});v.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});v.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});v=q.addMenu({title:"table.row"});v.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});v.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});v.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});v.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});v.addSeparator();v.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});v.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});v.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!j);v.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!j);v=q.addMenu({title:"table.col"});v.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});v.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});v.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(!b.isIE){function n(){var q;for(q=l.getBody().lastChild;q&&q.nodeType==3&&!q.nodeValue.length;q=q.previousSibling){}if(q&&q.nodeName=="TABLE"){l.dom.add(l.getBody(),"p",null,'<br mce_bogus="1" />')}}if(b.isGecko){l.onKeyDown.add(function(r,t){var q,s,u=r.dom;if(t.keyCode==37||t.keyCode==38){q=r.selection.getRng();s=u.getParent(q.startContainer,"table");if(s&&r.getBody().firstChild==s){if(isAtStart(q,s)){q=u.createRng();q.setStartBefore(s);q.setEndBefore(s);r.selection.setRng(q);t.preventDefault()}}}})}l.onKeyUp.add(n);l.onSetContent.add(n);l.onVisualAid.add(n);l.onPreProcess.add(function(q,s){var r=s.node.lastChild;if(r&&r.childNodes.length==1&&r.firstChild.nodeName=="BR"){q.dom.remove(r)}});n()}});c({mceTableSplitCells:function(k){k.split()},mceTableMergeCells:function(l){var m,n,k;k=e.dom.getParent(e.selection.getNode(),"th,td");if(k){m=k.rowSpan;n=k.colSpan}if(!e.dom.select("td.mceSelected,th.mceSelected").length){d.open({url:f+"/merge_cells.htm",width:240+parseInt(e.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(e.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:m,cols:n,onaction:function(o){l.merge(k,o.cols,o.rows)},plugin_url:f})}else{l.merge()}},mceTableInsertRowBefore:function(k){k.insertRow(true)},mceTableInsertRowAfter:function(k){k.insertRow()},mceTableInsertColBefore:function(k){k.insertCol(true)},mceTableInsertColAfter:function(k){k.insertCol()},mceTableDeleteCol:function(k){k.deleteCols()},mceTableDeleteRow:function(k){k.deleteRows()},mceTableCutRow:function(k){j=k.cutRows()},mceTableCopyRow:function(k){j=k.copyRows()},mceTablePasteRowBefore:function(k){k.pasteRows(j,true)},mceTablePasteRowAfter:function(k){k.pasteRows(j)},mceTableDelete:function(k){k.deleteTable()}},function(l,k){e.addCommand(k,function(){var m=h();if(m){l(m);e.execCommand("mceRepaint");g()}})});c({mceInsertTable:function(k){d.open({url:f+"/table.htm",width:400+parseInt(e.getLang("table.table_delta_width",0)),height:320+parseInt(e.getLang("table.table_delta_height",0)),inline:1},{plugin_url:f,action:k?k.action:0})},mceTableRowProps:function(){d.open({url:f+"/row.htm",width:400+parseInt(e.getLang("table.rowprops_delta_width",0)),height:295+parseInt(e.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:f})},mceTableCellProps:function(){d.open({url:f+"/cell.htm",width:400+parseInt(e.getLang("table.cellprops_delta_width",0)),height:295+parseInt(e.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:f})}},function(l,k){e.addCommand(k,function(m,n){l(n)})})}});b.PluginManager.add("table",b.plugins.TablePlugin)})(tinymce);

data/public/javascripts/tiny_mce/plugins/table/editor_plugin_src.js

@@ -1,1160 +1,1118 @@
 /**
- * $Id: editor_plugin_src.js 1206 2009-08-19 12:30:52Z spocke $
+ * editor_plugin_src.js
  *
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
  */
 
-(function() {
+(function(tinymce) {
 	var each = tinymce.each;
 
-	tinymce.create('tinymce.plugins.TablePlugin', {
-		init : function(ed, url) {
-			var t = this;
+	/**
+	 * Table Grid class.
+	 */
+	function TableGrid(table, dom, selection) {
+		var grid, startPos, endPos, selectedCell;
+
+		buildGrid();
+		selectedCell = dom.getParent(selection.getStart(), 'th,td');
+		if (selectedCell) {
+			startPos = getPos(selectedCell);
+			endPos = findEndPos();
+			selectedCell = getCell(startPos.x, startPos.y);
+		}
 
-			t.editor = ed;
-			t.url = url;
+		function buildGrid() {
+			var startY = 0;
 
-			// Register buttons
-			each([
-				['table', 'table.desc', 'mceInsertTable', true],
-				['delete_table', 'table.del', 'mceTableDelete'],
-				['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],
-				['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],
-				['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],
-				['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],
-				['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],
-				['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],
-				['row_props', 'table.row_desc', 'mceTableRowProps', true],
-				['cell_props', 'table.cell_desc', 'mceTableCellProps', true],
-				['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],
-				['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]
-			], function(c) {
-				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});
-			});
+			grid = [];
+
+			each(['thead', 'tbody', 'tfoot'], function(part) {
+				var rows = dom.select(part + ' tr', table);
 
-			if (ed.getParam('inline_styles')) {
-				// Force move of attribs to styles in strict mode
-				ed.onPreProcess.add(function(ed, o) {
-					var dom = ed.dom;
+				each(rows, function(tr, y) {
+					y += startY;
 
-					each(dom.select('table', o.node), function(n) {
-						var v;
+					each(dom.select('td,th', tr), function(td, x) {
+						var x2, y2, rowspan, colspan;
 
-						if (v = dom.getAttrib(n, 'width')) {
-							dom.setStyle(n, 'width', v);
-							dom.setAttrib(n, 'width');
+						// Skip over existing cells produced by rowspan
+						if (grid[y]) {
+							while (grid[y][x])
+								x++;
 						}
 
-						if (v = dom.getAttrib(n, 'height')) {
-							dom.setStyle(n, 'height', v);
-							dom.setAttrib(n, 'height');
+						// Get col/rowspan from cell
+						rowspan = getSpanVal(td, 'rowspan');
+						colspan = getSpanVal(td, 'colspan');
+
+						// Fill out rowspan/colspan right and down
+						for (y2 = y; y2 < y + rowspan; y2++) {
+							if (!grid[y2])
+								grid[y2] = [];
+
+							for (x2 = x; x2 < x + colspan; x2++) {
+								grid[y2][x2] = {
+									part : part,
+									real : y2 == y && x2 == x,
+									elm : td,
+									rowspan : rowspan,
+									colspan : colspan
+								};
+							}
 						}
 					});
 				});
-			}
 
-			ed.onInit.add(function() {
-				// Fixes an issue on Gecko where it's impossible to place the caret behind a table
-				// This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled
-				if (!tinymce.isIE && ed.getParam('forced_root_block')) {
-					function fixTableCaretPos() {
-						var last = ed.getBody().lastChild;
+				startY += rows.length;
+			});
+		};
 
-						if (last && last.nodeName == 'TABLE')
-							ed.dom.add(ed.getBody(), 'p', null, '<br mce_bogus="1" />');
-					};
+		function getCell(x, y) {
+			var row;
 
-					ed.onKeyUp.add(fixTableCaretPos);
-					ed.onSetContent.add(fixTableCaretPos);
-					ed.onVisualAid.add(fixTableCaretPos);
+			row = grid[y];
+			if (row)
+				return row[x];
+		};
 
-					ed.onPreProcess.add(function(ed, o) {
-						var last = o.node.lastChild;
+		function getSpanVal(td, name) {
+			return parseInt(td.getAttribute(name) || 1);
+		};
 
-						if (last && last.childNodes.length == 1 && last.firstChild.nodeName == 'BR')
-							ed.dom.remove(last);
-					});
+		function isCellSelected(cell) {
+			return dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell;
+		};
 
-					fixTableCaretPos();
-				}
+		function getSelectedRows() {
+			var rows = [];
 
-				if (ed && ed.plugins.contextmenu) {
-					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
-						var sm, se = ed.selection, el = se.getNode() || ed.getBody();
+			each(table.rows, function(row) {
+				each(row.cells, function(cell) {
+					if (dom.hasClass(cell, 'mceSelected') || cell == selectedCell.elm) {
+						rows.push(row);
+						return false;
+					}
+				});
+			});
 
-						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th')) {
-							m.removeAll();
+			return rows;
+		};
 
-							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {
-								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
-								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
-								m.addSeparator();
-							}
+		function deleteTable() {
+			var rng = dom.createRng();
 
-							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {
-								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
-								m.addSeparator();
-							}
+			rng.setStartAfter(table);
+			rng.setEndAfter(table);
 
-							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', ui : true, value : {action : 'insert'}});
-							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable', ui : true});
-							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete', ui : true});
-							m.addSeparator();
+			selection.setRng(rng);
 
-							// Cell menu
-							sm = m.addMenu({title : 'table.cell'});
-							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps', ui : true});
-							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells', ui : true});
-							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells', ui : true});
+			dom.remove(table);
+		};
 
-							// Row menu
-							sm = m.addMenu({title : 'table.row'});
-							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps', ui : true});
-							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});
-							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});
-							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});
-							sm.addSeparator();
-							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});
-							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});
-							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'});
-							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'});
+		function cloneCell(cell) {
+			var formatNode;
 
-							// Column menu
-							sm = m.addMenu({title : 'table.col'});
-							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});
-							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});
-							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});
-						} else
-							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', ui : true});
+			// Clone formats
+			tinymce.walk(cell, function(node) {
+				var curNode;
+
+				if (node.nodeType == 3) {
+					each(dom.getParents(node.parentNode, null, cell).reverse(), function(node) {
+						node = node.cloneNode(false);
+
+						if (!formatNode)
+							formatNode = curNode = node;
+						else if (curNode)
+							curNode.appendChild(node);
+
+						curNode = node;
 					});
-				}
-			});
 
-			// Add undo level when new rows are created using the tab key
-			ed.onKeyDown.add(function(ed, e) {
-				if (e.keyCode == 9 && ed.dom.getParent(ed.selection.getNode(), 'TABLE')) {
-					if (!tinymce.isGecko && !tinymce.isOpera) {
-						tinyMCE.execInstanceCommand(ed.editorId, "mceTableMoveToNextRow", true);
-						return tinymce.dom.Event.cancel(e);
-					}
+					// Add something to the inner node
+					if (curNode)
+						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br _mce_bogus="1" />';
 
-					ed.undoManager.add();
+					return false;
 				}
-			});
+			}, 'childNodes');
 
-			// Select whole table is a table border is clicked
-			if (!tinymce.isIE) {
-				if (ed.getParam('table_selection', true)) {
-					ed.onClick.add(function(ed, e) {
-						e = e.target;
+			cell = cell.cloneNode(false);
+			cell.rowSpan = cell.colSpan = 1;
 
-						if (e.nodeName === 'TABLE')
-							ed.selection.select(e);
-					});
-				}
+			if (formatNode) {
+				cell.appendChild(formatNode);
+			} else {
+				if (!tinymce.isIE)
+					cell.innerHTML = '<br _mce_bogus="1" />';
 			}
 
-			ed.onNodeChange.add(function(ed, cm, n) {
-				var p = ed.dom.getParent(n, 'td,th,caption');
+			return cell;
+		};
 
-				cm.setActive('table', n.nodeName === 'TABLE' || !!p);
-				if (p && p.nodeName === 'CAPTION')
-					p = null;
+		function cleanup() {
+			var rng = dom.createRng();
 
-				cm.setDisabled('delete_table', !p);
-				cm.setDisabled('delete_col', !p);
-				cm.setDisabled('delete_table', !p);
-				cm.setDisabled('delete_row', !p);
-				cm.setDisabled('col_after', !p);
-				cm.setDisabled('col_before', !p);
-				cm.setDisabled('row_after', !p);
-				cm.setDisabled('row_before', !p);
-				cm.setDisabled('row_props', !p);
-				cm.setDisabled('cell_props', !p);
-				cm.setDisabled('split_cells', !p || (parseInt(ed.dom.getAttrib(p, 'colspan', '1')) < 2 && parseInt(ed.dom.getAttrib(p, 'rowspan', '1')) < 2));
-				cm.setDisabled('merge_cells', !p);
+			// Empty rows
+			each(dom.select('tr', table), function(tr) {
+				if (tr.cells.length == 0)
+					dom.remove(tr);
 			});
 
-			// Padd empty table cells
-			if (!tinymce.isIE) {
-				ed.onBeforeSetContent.add(function(ed, o) {
-					if (o.initial)
-						o.content = o.content.replace(/<(td|th)([^>]+|)>\s*<\/(td|th)>/g, tinymce.isOpera ? '<$1$2>&nbsp;</$1>' : '<$1$2><br mce_bogus="1" /></$1>');
-				});
-			}
-		},
-
-		execCommand : function(cmd, ui, val) {
-			var ed = this.editor, b;
-
-			// Is table command
-			switch (cmd) {
-				case "mceTableMoveToNextRow":
-				case "mceInsertTable":
-				case "mceTableRowProps":
-				case "mceTableCellProps":
-				case "mceTableSplitCells":
-				case "mceTableMergeCells":
-				case "mceTableInsertRowBefore":
-				case "mceTableInsertRowAfter":
-				case "mceTableDeleteRow":
-				case "mceTableInsertColBefore":
-				case "mceTableInsertColAfter":
-				case "mceTableDeleteCol":
-				case "mceTableCutRow":
-				case "mceTableCopyRow":
-				case "mceTablePasteRowBefore":
-				case "mceTablePasteRowAfter":
-				case "mceTableDelete":
-					ed.execCommand('mceBeginUndoLevel');
-					this._doExecCommand(cmd, ui, val);
-					ed.execCommand('mceEndUndoLevel');
-
-					return true;
+			// Empty table
+			if (dom.select('tr', table).length == 0) {
+				rng.setStartAfter(table);
+				rng.setEndAfter(table);
+				selection.setRng(rng);
+				dom.remove(table);
+				return;
 			}
 
-			// Pass to next handler in chain
-			return false;
-		},
-
-		getInfo : function() {
-			return {
-				longname : 'Tables',
-				author : 'Moxiecode Systems AB',
-				authorurl : 'http://tinymce.moxiecode.com',
-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table',
-				version : tinymce.majorVersion + "." + tinymce.minorVersion
-			};
-		},
-
-		// Private plugin internal methods
-
-		/**
-		 * Executes the table commands.
-		 */
-		_doExecCommand : function(command, user_interface, value) {
-			var inst = this.editor, ed = inst, url = this.url;
-			var focusElm = inst.selection.getNode();
-			var trElm = inst.dom.getParent(focusElm, "tr");
-			var tdElm = inst.dom.getParent(focusElm, "td,th");
-			var tableElm = inst.dom.getParent(focusElm, "table");
-			var doc = inst.contentWindow.document;
-			var tableBorder = tableElm ? tableElm.getAttribute("border") : "";
-
-			// Get first TD if no TD found
-			if (trElm && tdElm == null)
-				tdElm = trElm.cells[0];
-
-			function inArray(ar, v) {
-				for (var i=0; i<ar.length; i++) {
-					// Is array
-					if (ar[i].length > 0 && inArray(ar[i], v))
-						return true;
-
-					// Found value
-					if (ar[i] == v)
-						return true;
-				}
+			// Empty header/body/footer
+			each(dom.select('thead,tbody,tfoot', table), function(part) {
+				if (part.rows.length == 0)
+					dom.remove(part);
+			});
+
+			// Restore selection to start position if it still exists
+			buildGrid();
 
-				return false;
+			// Restore the selection to the closest table position
+			row = grid[Math.min(grid.length - 1, startPos.y)];
+			if (row) {
+				selection.select(row[Math.min(row.length - 1, startPos.x)].elm, true);
+				selection.collapse(true);
 			}
+		};
 
-			function select(dx, dy) {
-				var td;
+		function fillLeftDown(x, y, rows, cols) {
+			var tr, x2, r, c, cell;
 
-				grid = getTableGrid(tableElm);
-				dx = dx || 0;
-				dy = dy || 0;
-				dx = Math.max(cpos.cellindex + dx, 0);
-				dy = Math.max(cpos.rowindex + dy, 0);
+			tr = grid[y][x].elm.parentNode;
+			for (r = 1; r <= rows; r++) {
+				tr = dom.getNext(tr, 'tr');
 
-				// Recalculate grid and select
-				inst.execCommand('mceRepaint');
-				td = getCell(grid, dy, dx);
+				if (tr) {
+					// Loop left to find real cell
+					for (x2 = x; x2 >= 0; x2--) {
+						cell = grid[y + r][x2].elm;
 
-				if (td) {
-					inst.selection.select(td.firstChild || td);
-					inst.selection.collapse(1);
-				}
-			};
+						if (cell.parentNode == tr) {
+							// Append clones after
+							for (c = 1; c <= cols; c++)
+								dom.insertAfter(cloneCell(cell), cell);
 
-			function makeTD() {
-				var newTD = doc.createElement("td");
+							break;
+						}
+					}
 
-				if (!tinymce.isIE)
-					newTD.innerHTML = '<br mce_bogus="1"/>';
+					if (x2 == -1) {
+						// Insert nodes before first cell
+						for (c = 1; c <= cols; c++)
+							tr.insertBefore(cloneCell(tr.cells[0]), tr.cells[0]);
+					}
+				}
 			}
+		};
+
+		function split() {
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan, newCell, i;
+
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						colSpan = getSpanVal(cell, 'colspan');
+						rowSpan = getSpanVal(cell, 'rowspan');
 
-			function getColRowSpan(td) {
-				var colspan = inst.dom.getAttrib(td, "colspan");
-				var rowspan = inst.dom.getAttrib(td, "rowspan");
+						if (colSpan > 1 || rowSpan > 1) {
+							cell.colSpan = cell.rowSpan = 1;
 
-				colspan = colspan == "" ? 1 : parseInt(colspan);
-				rowspan = rowspan == "" ? 1 : parseInt(rowspan);
+							// Insert cells right
+							for (i = 0; i < colSpan - 1; i++)
+								dom.insertAfter(cloneCell(cell), cell);
 
-				return {colspan : colspan, rowspan : rowspan};
+							fillLeftDown(x, y, rowSpan - 1, colSpan);
+						}
+					}
+				});
+			});
+		};
+
+		function merge(cell, cols, rows) {
+			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children;
+
+			// Use specified cell and cols/rows
+			if (cell) {
+				pos = getPos(cell);
+				startX = pos.x;
+				startY = pos.y;
+				endX = startX + (cols - 1);
+				endY = startY + (rows - 1);
+			} else {
+				// Use selection
+				startX = startPos.x;
+				startY = startPos.y;
+				endX = endPos.x;
+				endY = endPos.y;
 			}
 
-			function getCellPos(grid, td) {
-				var x, y;
+			// Find start/end cells
+			startCell = getCell(startX, startY);
+			endCell = getCell(endX, endY);
+
+			// Check if the cells exists and if they are of the same part for example tbody = tbody
+			if (startCell && endCell && startCell.part == endCell.part) {
+				// Split and rebuild grid
+				split();
+				buildGrid();
+
+				// Set row/col span to start cell
+				startCell = getCell(startX, startY).elm;
+				startCell.colSpan = (endX - startX) + 1;
+				startCell.rowSpan = (endY - startY) + 1;
+
+				// Remove other cells and add it's contents to the start cell
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						cell = grid[y][x].elm;
+
+						if (cell != startCell) {
+							// Move children to startCell
+							children = tinymce.grep(cell.childNodes);
+							each(children, function(node, i) {
+								// Jump over last BR element
+								if (node.nodeName != 'BR' || i != children.length - 1)
+									startCell.appendChild(node);
+							});
 
-				for (y=0; y<grid.length; y++) {
-					for (x=0; x<grid[y].length; x++) {
-						if (grid[y][x] == td)
-							return {cellindex : x, rowindex : y};
+							// Remove cell
+							dom.remove(cell);
+						}
 					}
 				}
 
-				return null;
+				// Remove empty rows etc and restore caret location
+				cleanup();
 			}
+		};
+
+		function insertRow(before) {
+			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell;
+
+			// Find first/last row
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						rowElm = cell.parentNode;
+						newRow = rowElm.cloneNode(false);
+						posY = y;
+
+						if (before)
+							return false;
+					}
+				});
 
-			function getCell(grid, row, col) {
-				if (grid[row] && grid[row][col])
-					return grid[row][col];
+				if (before)
+					return !posY;
+			});
 
-				return null;
-			}
+			for (x = 0; x < grid[0].length; x++) {
+				cell = grid[posY][x].elm;
 
-			function getNextCell(table, cell) {
-				var cells = [], x = 0, i, j, cell, nextCell;
+				if (cell != lastCell) {
+					if (!before) {
+						rowSpan = getSpanVal(cell, 'rowspan');
+						if (rowSpan > 1) {
+							cell.rowSpan = rowSpan + 1;
+							continue;
+						}
+					} else {
+						// Check if cell above can be expanded
+						if (posY > 0 && grid[posY - 1][x]) {
+							otherCell = grid[posY - 1][x].elm;
+							rowSpan = getSpanVal(otherCell, 'rowspan');
+							if (rowSpan > 1) {
+								otherCell.rowSpan = rowSpan + 1;
+								continue;
+							}
+						}
+					}
 
-				for (i = 0; i < table.rows.length; i++)
-					for (j = 0; j < table.rows[i].cells.length; j++, x++)
-						cells[x] = table.rows[i].cells[j];
+					// Insert new cell into new row
+					newCell = cloneCell(cell)
+					newCell.colSpan = cell.colSpan;
+					newRow.appendChild(newCell);
 
-				for (i = 0; i < cells.length; i++)
-					if (cells[i] == cell)
-						if (nextCell = cells[i+1])
-							return nextCell;
+					lastCell = cell;
+				}
 			}
 
-			function getTableGrid(table) {
-				var grid = [], rows = table.rows, x, y, td, sd, xstart, x2, y2;
-
-				for (y=0; y<rows.length; y++) {
-					for (x=0; x<rows[y].cells.length; x++) {
-						td = rows[y].cells[x];
-						sd = getColRowSpan(td);
+			if (newRow.hasChildNodes()) {
+				if (!before)
+					dom.insertAfter(newRow, rowElm);
+				else
+					rowElm.parentNode.insertBefore(newRow, rowElm);
+			}
+		};
 
-						// All ready filled
-						for (xstart = x; grid[y] && grid[y][xstart]; xstart++) ;
+		function insertCol(before) {
+			var posX, lastCell;
 
-						// Fill box
-						for (y2=y; y2<y+sd['rowspan']; y2++) {
-							if (!grid[y2])
-								grid[y2] = [];
+			// Find first/last column
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						posX = x;
 
-							for (x2=xstart; x2<xstart+sd['colspan']; x2++)
-								grid[y2][x2] = td;
-						}
+						if (before)
+							return false;
 					}
-				}
+				});
 
-				return grid;
-			}
+				if (before)
+					return !posX;
+			});
 
-			function trimRow(table, tr, td, new_tr) {
-				var grid = getTableGrid(table), cpos = getCellPos(grid, td);
-				var cells, lastElm;
-
-				// Time to crop away some
-				if (new_tr.cells.length != tr.childNodes.length) {
-					cells = tr.childNodes;
-					lastElm = null;
-
-					for (var x=0; td = getCell(grid, cpos.rowindex, x); x++) {
-						var remove = true;
-						var sd = getColRowSpan(td);
-
-						// Remove due to rowspan
-						if (inArray(cells, td)) {
-							new_tr.childNodes[x]._delete = true;
-						} else if ((lastElm == null || td != lastElm) && sd.colspan > 1) { // Remove due to colspan
-							for (var i=x; i<x+td.colSpan; i++)
-								new_tr.childNodes[i]._delete = true;
-						}
+			each(grid, function(row, y) {
+				var cell = row[posX].elm, rowSpan, colSpan;
 
-						if ((lastElm == null || td != lastElm) && sd.rowspan > 1)
-							td.rowSpan = sd.rowspan + 1;
+				if (cell != lastCell) {
+					colSpan = getSpanVal(cell, 'colspan');
+					rowSpan = getSpanVal(cell, 'rowspan');
 
-						lastElm = td;
-					}
+					if (colSpan == 1) {
+						if (!before) {
+							dom.insertAfter(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						} else {
+							cell.parentNode.insertBefore(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						}
+					} else
+						cell.colSpan++;
 
-					deleteMarked(tableElm);
+					lastCell = cell;
 				}
-			}
+			});
+		};
 
-			function prevElm(node, name) {
-				while ((node = node.previousSibling) != null) {
-					if (node.nodeName == name)
-						return node;
-				}
+		function deleteCols() {
+			var cols = [];
 
-				return null;
-			}
+			// Get selected column indexes
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell) && tinymce.inArray(cols, x) === -1) {
+						each(grid, function(row) {
+							var cell = row[x].elm, colSpan;
+
+							colSpan = getSpanVal(cell, 'colspan');
 
-			function nextElm(node, names) {
-				var namesAr = names.split(',');
+							if (colSpan > 1)
+								cell.colSpan = colSpan - 1;
+							else
+								dom.remove(cell);
+						});
 
-				while ((node = node.nextSibling) != null) {
-					for (var i=0; i<namesAr.length; i++) {
-						if (node.nodeName.toLowerCase() == namesAr[i].toLowerCase() )
-							return node;
+						cols.push(x);
 					}
-				}
+				});
+			});
 
-				return null;
-			}
+			cleanup();
+		};
 
-			function deleteMarked(tbl) {
-				if (tbl.rows == 0)
-					return;
+		function deleteRows() {
+			var rows;
 
-				var tr = tbl.rows[0];
-				do {
-					var next = nextElm(tr, "TR");
+			function deleteRow(tr) {
+				var nextTr, pos, lastCell;
 
-					// Delete row
-					if (tr._delete) {
-						tr.parentNode.removeChild(tr);
-						continue;
-					}
+				nextTr = dom.getNext(tr, 'tr');
 
-					// Delete cells
-					var td = tr.cells[0];
-					if (td.cells > 1) {
-						do {
-							var nexttd = nextElm(td, "TD,TH");
+				// Move down row spanned cells
+				each(tr.cells, function(cell) {
+					var rowSpan = getSpanVal(cell, 'rowspan');
 
-							if (td._delete)
-								td.parentNode.removeChild(td);
-						} while ((td = nexttd) != null);
+					if (rowSpan > 1) {
+						cell.rowSpan = rowSpan - 1;
+						pos = getPos(cell);
+						fillLeftDown(pos.x, pos.y, 1, 1);
 					}
-				} while ((tr = next) != null);
-			}
+				});
 
-			function addRows(td_elm, tr_elm, rowspan) {
-				// Add rows
-				td_elm.rowSpan = 1;
-				var trNext = nextElm(tr_elm, "TR");
-				for (var i=1; i<rowspan && trNext; i++) {
-					var newTD = doc.createElement("td");
+				// Delete cells
+				pos = getPos(tr.cells[0]);
+				each(grid[pos.y], function(cell) {
+					var rowSpan;
 
-					if (!tinymce.isIE)
-						newTD.innerHTML = '<br mce_bogus="1"/>';
+					cell = cell.elm;
 
-					if (tinymce.isIE)
-						trNext.insertBefore(newTD, trNext.cells(td_elm.cellIndex));
-					else
-						trNext.insertBefore(newTD, trNext.cells[td_elm.cellIndex]);
+					if (cell != lastCell) {
+						rowSpan = getSpanVal(cell, 'rowspan');
 
-					trNext = nextElm(trNext, "TR");
-				}
-			}
+						if (rowSpan <= 1)
+							dom.remove(cell);
+						else
+							cell.rowSpan = rowSpan - 1;
 
-			function copyRow(doc, table, tr) {
-				var grid = getTableGrid(table);
-				var newTR = tr.cloneNode(false);
-				var cpos = getCellPos(grid, tr.cells[0]);
-				var lastCell = null;
-				var tableBorder = inst.dom.getAttrib(table, "border");
-				var tdElm = null;
-
-				for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-					var newTD = null;
-
-					if (lastCell != tdElm) {
-						for (var i=0; i<tr.cells.length; i++) {
-							if (tdElm == tr.cells[i]) {
-								newTD = tdElm.cloneNode(true);
-								break;
-							}
-						}
+						lastCell = cell;
 					}
+				});
+			};
 
-					if (newTD == null) {
-						newTD = doc.createElement("td");
+			// Get selected rows and move selection out of scope
+			rows = getSelectedRows();
 
-						if (!tinymce.isIE)
-							newTD.innerHTML = '<br mce_bogus="1"/>';
-					}
+			// Delete all selected rows
+			each(rows.reverse(), function(tr) {
+				deleteRow(tr);
+			});
 
-					// Reset col/row span
-					newTD.colSpan = 1;
-					newTD.rowSpan = 1;
+			cleanup();
+		};
 
-					newTR.appendChild(newTD);
+		function cutRows() {
+			var rows = getSelectedRows();
 
-					lastCell = tdElm;
-				}
+			dom.remove(rows);
+			cleanup();
 
-				return newTR;
-			}
+			return rows;
+		};
 
-			// ---- Commands -----
+		function copyRows() {
+			var rows = getSelectedRows();
 
-			// Handle commands
-			switch (command) {
-				case "mceTableMoveToNextRow":
-					var nextCell = getNextCell(tableElm, tdElm);
+			each(rows, function(row, i) {
+				rows[i] = row.cloneNode(true);
+			});
 
-					if (!nextCell) {
-						inst.execCommand("mceTableInsertRowAfter", tdElm);
-						nextCell = getNextCell(tableElm, tdElm);
-					}
+			return rows;
+		};
 
-					inst.selection.select(nextCell);
-					inst.selection.collapse(true);
+		function pasteRows(rows, before) {
+			var selectedRows = getSelectedRows(),
+				targetRow = selectedRows[before ? 0 : selectedRows.length - 1],
+				targetCellCount = targetRow.cells.length;
 
-					return true;
+			// Calc target cell count
+			each(grid, function(row) {
+				var match;
 
-				case "mceTableRowProps":
-					if (trElm == null)
-						return true;
+				targetCellCount = 0;
+				each(row, function(cell, x) {
+					if (cell.real)
+						targetCellCount += cell.colspan;
 
-					if (user_interface) {
-						inst.windowManager.open({
-							url : url + '/row.htm',
-							width : 400 + parseInt(inst.getLang('table.rowprops_delta_width', 0)),
-							height : 295 + parseInt(inst.getLang('table.rowprops_delta_height', 0)),
-							inline : 1
-						}, {
-							plugin_url : url
-						});
-					}
+					if (cell.elm.parentNode == targetRow)
+						match = 1;
+				});
 
-					return true;
+				if (match)
+					return false;
+			});
 
-				case "mceTableCellProps":
-					if (tdElm == null)
-						return true;
+			if (!before)
+				rows.reverse();
 
-					if (user_interface) {
-						inst.windowManager.open({
-							url : url + '/cell.htm',
-							width : 400 + parseInt(inst.getLang('table.cellprops_delta_width', 0)),
-							height : 295 + parseInt(inst.getLang('table.cellprops_delta_height', 0)),
-							inline : 1
-						}, {
-							plugin_url : url
-						});
-					}
+			each(rows, function(row) {
+				var cellCount = row.cells.length, cell;
 
-					return true;
+				// Remove col/rowspans
+				for (i = 0; i < cellCount; i++) {
+					cell = row.cells[i];
+					cell.colSpan = cell.rowSpan = 1;
+				}
 
-				case "mceInsertTable":
-					if (user_interface) {
-						inst.windowManager.open({
-							url : url + '/table.htm',
-							width : 400 + parseInt(inst.getLang('table.table_delta_width', 0)),
-							height : 320 + parseInt(inst.getLang('table.table_delta_height', 0)),
-							inline : 1
-						}, {
-							plugin_url : url,
-							action : value ? value.action : 0
-						});
-					}
+				// Needs more cells
+				for (i = cellCount; i < targetCellCount; i++)
+					row.appendChild(cloneCell(row.cells[cellCount - 1]));
 
-					return true;
+				// Needs less cells
+				for (i = targetCellCount; i < cellCount; i++)
+					dom.remove(row.cells[i]);
 
-				case "mceTableDelete":
-					var table = inst.dom.getParent(inst.selection.getNode(), "table");
-					if (table) {
-						table.parentNode.removeChild(table);
-						inst.execCommand('mceRepaint');
-					}
-					return true;
-
-				case "mceTableSplitCells":
-				case "mceTableMergeCells":
-				case "mceTableInsertRowBefore":
-				case "mceTableInsertRowAfter":
-				case "mceTableDeleteRow":
-				case "mceTableInsertColBefore":
-				case "mceTableInsertColAfter":
-				case "mceTableDeleteCol":
-				case "mceTableCutRow":
-				case "mceTableCopyRow":
-				case "mceTablePasteRowBefore":
-				case "mceTablePasteRowAfter":
-					// No table just return (invalid command)
-					if (!tableElm)
-						return true;
-
-					// Table has a tbody use that reference
-					// Changed logic by ApTest 2005.07.12 (www.aptest.com)
-					// Now lookk at the focused element and take its parentNode.  That will be a tbody or a table.
-					if (trElm && tableElm != trElm.parentNode)
-						tableElm = trElm.parentNode;
-
-					if (tableElm && trElm) {
-						switch (command) {
-							case "mceTableCutRow":
-								if (!trElm || !tdElm)
-									return true;
-
-								inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
-								inst.execCommand("mceTableDeleteRow");
-								break;
-
-							case "mceTableCopyRow":
-								if (!trElm || !tdElm)
-									return true;
-
-								inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
-								break;
-
-							case "mceTablePasteRowBefore":
-								if (!trElm || !tdElm)
-									return true;
-
-								var newTR = inst.tableRowClipboard.cloneNode(true);
-
-								var prevTR = prevElm(trElm, "TR");
-								if (prevTR != null)
-									trimRow(tableElm, prevTR, prevTR.cells[0], newTR);
-
-								trElm.parentNode.insertBefore(newTR, trElm);
-								break;
-
-							case "mceTablePasteRowAfter":
-								if (!trElm || !tdElm)
-									return true;
-								
-								var nextTR = nextElm(trElm, "TR");
-								var newTR = inst.tableRowClipboard.cloneNode(true);
-
-								trimRow(tableElm, trElm, tdElm, newTR);
-
-								if (nextTR == null)
-									trElm.parentNode.appendChild(newTR);
-								else
-									nextTR.parentNode.insertBefore(newTR, nextTR);
-
-								break;
-
-							case "mceTableInsertRowBefore":
-								if (!trElm || !tdElm)
-									return true;
-
-								var grid = getTableGrid(tableElm);
-								var cpos = getCellPos(grid, tdElm);
-								var newTR = doc.createElement("tr");
-								var lastTDElm = null;
-
-								cpos.rowindex--;
-								if (cpos.rowindex < 0)
-									cpos.rowindex = 0;
-
-								// Create cells
-								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
-
-										if (sd['rowspan'] == 1) {
-											var newTD = doc.createElement("td");
-
-											if (!tinymce.isIE)
-												newTD.innerHTML = '<br mce_bogus="1"/>';
-
-											newTD.colSpan = tdElm.colSpan;
-
-											newTR.appendChild(newTD);
-										} else
-											tdElm.rowSpan = sd['rowspan'] + 1;
-
-										lastTDElm = tdElm;
-									}
-								}
+				// Add before/after
+				if (before)
+					targetRow.parentNode.insertBefore(row, targetRow);
+				else
+					dom.insertAfter(row, targetRow);
+			});
+		};
 
-								trElm.parentNode.insertBefore(newTR, trElm);
-								select(0, 1);
-							break;
+		function getPos(target) {
+			var pos;
 
-							case "mceTableInsertRowAfter":
-								if (!trElm || !tdElm)
-									return true;
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (cell.elm == target) {
+						pos = {x : x, y : y};
+						return false;
+					}
+				});
 
-								var grid = getTableGrid(tableElm);
-								var cpos = getCellPos(grid, tdElm);
-								var newTR = doc.createElement("tr");
-								var lastTDElm = null;
+				return !pos;
+			});
 
-								// Create cells
-								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
+			return pos;
+		};
 
-										if (sd['rowspan'] == 1) {
-											var newTD = doc.createElement("td");
+		function setStartCell(cell) {
+			startPos = getPos(cell);
+		};
 
-											if (!tinymce.isIE)
-												newTD.innerHTML = '<br mce_bogus="1"/>';
+		function findEndPos() {
+			var pos, maxX, maxY;
 
-											newTD.colSpan = tdElm.colSpan;
+			maxX = maxY = 0;
 
-											newTR.appendChild(newTD);
-										} else
-											tdElm.rowSpan = sd['rowspan'] + 1;
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan;
 
-										lastTDElm = tdElm;
-									}
-								}
+					if (isCellSelected(cell)) {
+						cell = grid[y][x];
 
-								if (newTR.hasChildNodes()) {
-									var nextTR = nextElm(trElm, "TR");
-									if (nextTR)
-										nextTR.parentNode.insertBefore(newTR, nextTR);
-									else
-										tableElm.appendChild(newTR);
-								}
+						if (x > maxX)
+							maxX = x;
 
-								select(0, 1);
-							break;
+						if (y > maxY)
+							maxY = y;
 
-							case "mceTableDeleteRow":
-								if (!trElm || !tdElm)
-									return true;
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
 
-								var grid = getTableGrid(tableElm);
-								var cpos = getCellPos(grid, tdElm);
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
 
-								// Only one row, remove whole table
-								if (grid.length == 1 && tableElm.nodeName == 'TBODY') {
-									inst.dom.remove(inst.dom.getParent(tableElm, "table"));
-									return true;
-								}
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
+							}
+						}
+					}
+				});
+			});
 
-								// Move down row spanned cells
-								var cells = trElm.cells;
-								var nextTR = nextElm(trElm, "TR");
-								for (var x=0; x<cells.length; x++) {
-									if (cells[x].rowSpan > 1) {
-										var newTD = cells[x].cloneNode(true);
-										var sd = getColRowSpan(cells[x]);
+			return {x : maxX, y : maxY};
+		};
 
-										newTD.rowSpan = sd.rowspan - 1;
+		function setEndCell(cell) {
+			var startX, startY, endX, endY, maxX, maxY, colSpan, rowSpan;
 
-										var nextTD = nextTR.cells[x];
+			endPos = getPos(cell);
 
-										if (nextTD == null)
-											nextTR.appendChild(newTD);
-										else
-											nextTR.insertBefore(newTD, nextTD);
-									}
-								}
+			if (startPos && endPos) {
+				// Get start/end positions
+				startX = Math.min(startPos.x, endPos.x);
+				startY = Math.min(startPos.y, endPos.y);
+				endX = Math.max(startPos.x, endPos.x);
+				endY = Math.max(startPos.y, endPos.y);
 
-								// Delete cells
-								var lastTDElm = null;
-								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
+				// Expand end positon to include spans
+				maxX = endX;
+				maxY = endY;
 
-										if (sd.rowspan > 1) {
-											tdElm.rowSpan = sd.rowspan - 1;
-										} else {
-											trElm = tdElm.parentNode;
+				// Expand startX
+				for (y = startY; y <= maxY; y++) {
+					cell = grid[y][startX];
 
-											if (trElm.parentNode)
-												trElm._delete = true;
-										}
+					if (!cell.real) {
+						if (startX - (cell.colspan - 1) < startX)
+							startX -= cell.colspan - 1;
+					}
+				}
 
-										lastTDElm = tdElm;
-									}
-								}
+				// Expand startY
+				for (x = startX; x <= maxX; x++) {
+					cell = grid[startY][x];
 
-								deleteMarked(tableElm);
+					if (!cell.real) {
+						if (startY - (cell.rowspan - 1) < startY)
+							startY -= cell.rowspan - 1;
+					}
+				}
 
-								select(0, -1);
-							break;
+				// Find max X, Y
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						cell = grid[y][x];
 
-							case "mceTableInsertColBefore":
-								if (!trElm || !tdElm)
-									return true;
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
 
-								var grid = getTableGrid(inst.dom.getParent(tableElm, "table"));
-								var cpos = getCellPos(grid, tdElm);
-								var lastTDElm = null;
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
 
-								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
+							}
+						}
+					}
+				}
 
-										if (sd['colspan'] == 1) {
-											var newTD = doc.createElement(tdElm.nodeName);
+				// Remove current selection
+				dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
 
-											if (!tinymce.isIE)
-												newTD.innerHTML = '<br mce_bogus="1"/>';
+				// Add new selection
+				for (y = startY; y <= maxY; y++) {
+					for (x = startX; x <= maxX; x++)
+						dom.addClass(grid[y][x].elm, 'mceSelected');
+				}
+			}
+		};
+
+		// Expose to public
+		tinymce.extend(this, {
+			deleteTable : deleteTable,
+			split : split,
+			merge : merge,
+			insertRow : insertRow,
+			insertCol : insertCol,
+			deleteCols : deleteCols,
+			deleteRows : deleteRows,
+			cutRows : cutRows,
+			copyRows : copyRows,
+			pasteRows : pasteRows,
+			getPos : getPos,
+			setStartCell : setStartCell,
+			setEndCell : setEndCell
+		});
+	};
 
-											newTD.rowSpan = tdElm.rowSpan;
+	tinymce.create('tinymce.plugins.TablePlugin', {
+		init : function(ed, url) {
+			var winMan, clipboardRows;
 
-											tdElm.parentNode.insertBefore(newTD, tdElm);
-										} else
-											tdElm.colSpan++;
+			function createTableGrid(node) {
+				var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table');
 
-										lastTDElm = tdElm;
-									}
-								}
+				if (tblElm)
+					return new TableGrid(tblElm, ed.dom, selection);
+			};
 
-								select();
-							break;
+			function cleanup() {
+				// Restore selection possibilities
+				ed.getBody().style.webkitUserSelect = '';
+				ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+			};
 
-							case "mceTableInsertColAfter":
-								if (!trElm || !tdElm)
-									return true;
+			// Register buttons
+			each([
+				['table', 'table.desc', 'mceInsertTable', true],
+				['delete_table', 'table.del', 'mceTableDelete'],
+				['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],
+				['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],
+				['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],
+				['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],
+				['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],
+				['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],
+				['row_props', 'table.row_desc', 'mceTableRowProps', true],
+				['cell_props', 'table.cell_desc', 'mceTableCellProps', true],
+				['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],
+				['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]
+			], function(c) {
+				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});
+			});
 
-								var grid = getTableGrid(inst.dom.getParent(tableElm, "table"));
-								var cpos = getCellPos(grid, tdElm);
-								var lastTDElm = null;
+			// Select whole table is a table border is clicked
+			if (!tinymce.isIE) {
+				ed.onClick.add(function(ed, e) {
+					e = e.target;
 
-								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
+					if (e.nodeName === 'TABLE')
+						ed.selection.select(e);
+				});
+			}
 
-										if (sd['colspan'] == 1) {
-											var newTD = doc.createElement(tdElm.nodeName);
+			// Handle node change updates
+			ed.onNodeChange.add(function(ed, cm, n) {
+				var p;
 
-											if (!tinymce.isIE)
-												newTD.innerHTML = '<br mce_bogus="1"/>';
+				n = ed.selection.getStart();
+				p = ed.dom.getParent(n, 'td,th,caption');
+				cm.setActive('table', n.nodeName === 'TABLE' || !!p);
 
-											newTD.rowSpan = tdElm.rowSpan;
+				// Disable table tools if we are in caption
+				if (p && p.nodeName === 'CAPTION')
+					p = 0;
 
-											var nextTD = nextElm(tdElm, "TD,TH");
-											if (nextTD == null)
-												tdElm.parentNode.appendChild(newTD);
-											else
-												nextTD.parentNode.insertBefore(newTD, nextTD);
-										} else
-											tdElm.colSpan++;
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_col', !p);
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_row', !p);
+				cm.setDisabled('col_after', !p);
+				cm.setDisabled('col_before', !p);
+				cm.setDisabled('row_after', !p);
+				cm.setDisabled('row_before', !p);
+				cm.setDisabled('row_props', !p);
+				cm.setDisabled('cell_props', !p);
+				cm.setDisabled('split_cells', !p);
+				cm.setDisabled('merge_cells', !p);
+			});
 
-										lastTDElm = tdElm;
-									}
-								}
+			ed.onInit.add(function(ed) {
+				var startTable, startCell, dom = ed.dom, tableGrid;
 
-								select(1);
-							break;
+				winMan = ed.windowManager;
 
-							case "mceTableDeleteCol":
-								if (!trElm || !tdElm)
-									return true;
+				// Add cell selection logic
+				ed.onMouseDown.add(function(ed, e) {
+					if (e.button != 2) {
+						cleanup();
 
-								var grid = getTableGrid(tableElm);
-								var cpos = getCellPos(grid, tdElm);
-								var lastTDElm = null;
+						startCell = dom.getParent(e.target, 'td,th');
+						startTable = dom.getParent(startCell, 'table');
+					}
+				});
 
-								// Only one col, remove whole table
-								if ((grid.length > 1 && grid[0].length <= 1) && tableElm.nodeName == 'TBODY') {
-									inst.dom.remove(inst.dom.getParent(tableElm, "table"));
-									return true;
-								}
+				dom.bind(ed.getDoc(), 'mouseover', function(e) {
+					var sel, table, target = e.target;
 
-								// Delete cells
-								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
+					if (startCell && (tableGrid || target != startCell) && (target.nodeName == 'TD' || target.nodeName == 'TH')) {
+						table = dom.getParent(target, 'table');
+						if (table == startTable) {
+							if (!tableGrid) {
+								tableGrid = createTableGrid(table);
+								tableGrid.setStartCell(startCell);
 
-										if (sd['colspan'] > 1)
-											tdElm.colSpan = sd['colspan'] - 1;
-										else {
-											if (tdElm.parentNode)
-												tdElm.parentNode.removeChild(tdElm);
-										}
+								ed.getBody().style.webkitUserSelect = 'none';
+							}
 
-										lastTDElm = tdElm;
-									}
-								}
+							tableGrid.setEndCell(target);
+						}
 
-								select(-1);
-							break;
+						// Remove current selection
+						sel = ed.selection.getSel();
 
-						case "mceTableSplitCells":
-							if (!trElm || !tdElm)
-								return true;
+						if (sel.removeAllRanges)
+							sel.removeAllRanges();
+						else
+							sel.empty();
 
-							var spandata = getColRowSpan(tdElm);
+						e.preventDefault();
+					}
+				});
 
-							var colspan = spandata["colspan"];
-							var rowspan = spandata["rowspan"];
+				ed.onMouseUp.add(function(ed, e) {
+					var rng, sel = ed.selection, selectedCells, nativeSel = sel.getSel(), walker, node, lastNode, endNode;
 
-							// Needs splitting
-							if (colspan > 1 || rowspan > 1) {
-								// Generate cols
-								tdElm.colSpan = 1;
-								for (var i=1; i<colspan; i++) {
-									var newTD = doc.createElement("td");
+					// Move selection to startCell
+					if (startCell) {
+						if (tableGrid)
+							ed.getBody().style.webkitUserSelect = '';
 
-									if (!tinymce.isIE)
-										newTD.innerHTML = '<br mce_bogus="1"/>';
+						function setPoint(node, start) {
+							var walker = new tinymce.dom.TreeWalker(node, node);
 
-									trElm.insertBefore(newTD, nextElm(tdElm, "TD,TH"));
+							do {
+								// Text node
+								if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {
+									if (start)
+										rng.setStart(node, 0);
+									else
+										rng.setEnd(node, node.nodeValue.length);
 
-									if (rowspan > 1)
-										addRows(newTD, trElm, rowspan);
+									return;
 								}
 
-								addRows(tdElm, trElm, rowspan);
-							}
-
-							// Apply visual aids
-							tableElm = inst.dom.getParent(inst.selection.getNode(), "table");
-							break;
-
-						case "mceTableMergeCells":
-							var rows = [];
-							var sel = inst.selection.getSel();
-							var grid = getTableGrid(tableElm);
-
-							if (tinymce.isIE || sel.rangeCount == 1) {
-								if (user_interface) {
-									// Setup template
-									var sp = getColRowSpan(tdElm);
-
-									inst.windowManager.open({
-										url : url + '/merge_cells.htm',
-										width : 240 + parseInt(inst.getLang('table.merge_cells_delta_width', 0)),
-										height : 110 + parseInt(inst.getLang('table.merge_cells_delta_height', 0)),
-										inline : 1
-									}, {
-										action : "update",
-										numcols : sp.colspan,
-										numrows : sp.rowspan,
-										plugin_url : url
-									});
-
-									return true;
-								} else {
-									var numRows = parseInt(value['numrows']);
-									var numCols = parseInt(value['numcols']);
-									var cpos = getCellPos(grid, tdElm);
-
-									if (("" + numRows) == "NaN")
-										numRows = 1;
-
-									if (("" + numCols) == "NaN")
-										numCols = 1;
-
-									// Get rows and cells
-									var tRows = tableElm.rows;
-									for (var y=cpos.rowindex; y<grid.length; y++) {
-										var rowCells = [];
-
-										for (var x=cpos.cellindex; x<grid[y].length; x++) {
-											var td = getCell(grid, y, x);
-
-											if (td && !inArray(rows, td) && !inArray(rowCells, td)) {
-												var cp = getCellPos(grid, td);
-
-												// Within range
-												if (cp.cellindex < cpos.cellindex+numCols && cp.rowindex < cpos.rowindex+numRows)
-													rowCells[rowCells.length] = td;
-											}
-										}
-
-										if (rowCells.length > 0)
-											rows[rows.length] = rowCells;
-
-										var td = getCell(grid, cpos.rowindex, cpos.cellindex);
-										each(ed.dom.select('br', td), function(e, i) {
-											if (i > 0 && ed.dom.getAttrib('mce_bogus'))
-												ed.dom.remove(e);
-										});
-									}
+								// BR element
+								if (node.nodeName == 'BR') {
+									if (start)
+										rng.setStartBefore(node);
+									else
+										rng.setEndBefore(node);
 
-									//return true;
+									return;
 								}
-							} else {
-								var cells = [];
-								var sel = inst.selection.getSel();
-								var lastTR = null;
-								var curRow = null;
-								var x1 = -1, y1 = -1, x2, y2;
-
-								// Only one cell selected, whats the point?
-								if (sel.rangeCount < 2)
-									return true;
-
-								// Get all selected cells
-								for (var i=0; i<sel.rangeCount; i++) {
-									var rng = sel.getRangeAt(i);
-									var tdElm = rng.startContainer.childNodes[rng.startOffset];
-
-									if (!tdElm)
+							} while (node = (start ? walker.next() : walker.prev()));
+						};
+
+						// Try to expand text selection as much as we can only Gecko supports cell selection
+						selectedCells = dom.select('td.mceSelected,th.mceSelected');
+						if (selectedCells.length > 0) {
+							rng = dom.createRng();
+							node = selectedCells[0];
+							endNode = selectedCells[selectedCells.length - 1];
+
+							setPoint(node, 1);
+							walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table'));
+
+							do {
+								if (node.nodeName == 'TD' || node.nodeName == 'TH') {
+									if (!dom.hasClass(node, 'mceSelected'))
 										break;
 
-									if (tdElm.nodeName == "TD" || tdElm.nodeName == "TH")
-										cells[cells.length] = tdElm;
+									lastNode = node;
 								}
+							} while (node = walker.next());
 
-								// Get rows and cells
-								var tRows = tableElm.rows;
-								for (var y=0; y<tRows.length; y++) {
-									var rowCells = [];
+							setPoint(lastNode);
 
-									for (var x=0; x<tRows[y].cells.length; x++) {
-										var td = tRows[y].cells[x];
+							sel.setRng(rng);
+						}
 
-										for (var i=0; i<cells.length; i++) {
-											if (td == cells[i]) {
-												rowCells[rowCells.length] = td;
-											}
-										}
-									}
+						ed.nodeChanged();
+						startCell = tableGrid = startTable = null;
+					}
+				});
 
-									if (rowCells.length > 0)
-										rows[rows.length] = rowCells;
-								}
+				ed.onKeyUp.add(function(ed, e) {
+					cleanup();
+				});
 
-								// Find selected cells in grid and box
-								var curRow = [];
-								var lastTR = null;
-								for (var y=0; y<grid.length; y++) {
-									for (var x=0; x<grid[y].length; x++) {
-										grid[y][x]._selected = false;
-
-										for (var i=0; i<cells.length; i++) {
-											if (grid[y][x] == cells[i]) {
-												// Get start pos
-												if (x1 == -1) {
-													x1 = x;
-													y1 = y;
-												}
-
-												// Get end pos
-												x2 = x;
-												y2 = y;
-
-												grid[y][x]._selected = true;
-											}
-										}
-									}
-								}
+				// Add context menu
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
+						var sm, se = ed.selection, el = se.getNode() || ed.getBody();
 
-								// Is there gaps, if so deny
-								for (var y=y1; y<=y2; y++) {
-									for (var x=x1; x<=x2; x++) {
-										if (!grid[y][x]._selected) {
-											alert("Invalid selection for merge.");
-											return true;
-										}
-									}
-								}
+						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th')) {
+							m.removeAll();
+
+							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {
+								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
+								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
+								m.addSeparator();
 							}
 
-							// Validate selection and get total rowspan and colspan
-							var rowSpan = 1, colSpan = 1;
+							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {
+								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
+								m.addSeparator();
+							}
 
-							// Validate horizontal and get total colspan
-							var lastRowSpan = -1;
-							for (var y=0; y<rows.length; y++) {
-								var rowColSpan = 0;
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', value : {action : 'insert'}});
+							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable'});
+							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete'});
+							m.addSeparator();
 
-								for (var x=0; x<rows[y].length; x++) {
-									var sd = getColRowSpan(rows[y][x]);
+							// Cell menu
+							sm = m.addMenu({title : 'table.cell'});
+							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps'});
+							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells'});
+							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells'});
 
-									rowColSpan += sd['colspan'];
+							// Row menu
+							sm = m.addMenu({title : 'table.row'});
+							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps'});
+							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});
+							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});
+							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});
+							sm.addSeparator();
+							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});
+							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});
+							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'}).setDisabled(!clipboardRows);
+							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'}).setDisabled(!clipboardRows);
 
-									if (lastRowSpan != -1 && sd['rowspan'] != lastRowSpan) {
-										alert("Invalid selection for merge.");
-										return true;
-									}
+							// Column menu
+							sm = m.addMenu({title : 'table.col'});
+							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});
+							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});
+							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});
+						} else
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable'});
+					});
+				}
 
-									lastRowSpan = sd['rowspan'];
-								}
+				// Fixes an issue on Gecko where it's impossible to place the caret behind a table
+				// This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled
+				if (!tinymce.isIE) {
+					function fixTableCaretPos() {
+						var last;
 
-								if (rowColSpan > colSpan)
-									colSpan = rowColSpan;
+						// Skip empty text nodes form the end
+						for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;
 
-								lastRowSpan = -1;
-							}
+						if (last && last.nodeName == 'TABLE')
+							ed.dom.add(ed.getBody(), 'p', null, '<br mce_bogus="1" />');
+					};
 
-							// Validate vertical and get total rowspan
-							var lastColSpan = -1;
-							for (var x=0; x<rows[0].length; x++) {
-								var colRowSpan = 0;
+					// Fixes an bug where it's impossible to place the caret before a table in Gecko
+					// this fix solves it by detecting when the caret is at the beginning of such a table
+					// and then manually moves the caret infront of the table
+					if (tinymce.isGecko) {
+						ed.onKeyDown.add(function(ed, e) {
+							var rng, table, dom = ed.dom;
 
-								for (var y=0; y<rows.length; y++) {
-									var sd = getColRowSpan(rows[y][x]);
+							// On gecko it's not possible to place the caret before a table
+							if (e.keyCode == 37 || e.keyCode == 38) {
+								rng = ed.selection.getRng();
+								table = dom.getParent(rng.startContainer, 'table');
 
-									colRowSpan += sd['rowspan'];
+								if (table && ed.getBody().firstChild == table) {
+									if (isAtStart(rng, table)) {
+										rng = dom.createRng();
 
-									if (lastColSpan != -1 && sd['colspan'] != lastColSpan) {
-										alert("Invalid selection for merge.");
-										return true;
-									}
+										rng.setStartBefore(table);
+										rng.setEndBefore(table);
+
+										ed.selection.setRng(rng);
 
-									lastColSpan = sd['colspan'];
+										e.preventDefault();
+									}
 								}
+							}
+						});
+					}
+
+					ed.onKeyUp.add(fixTableCaretPos);
+					ed.onSetContent.add(fixTableCaretPos);
+					ed.onVisualAid.add(fixTableCaretPos);
 
-								if (colRowSpan > rowSpan)
-									rowSpan = colRowSpan;
+					ed.onPreProcess.add(function(ed, o) {
+						var last = o.node.lastChild;
 
-								lastColSpan = -1;
-							}
+						if (last && last.childNodes.length == 1 && last.firstChild.nodeName == 'BR')
+							ed.dom.remove(last);
+					});
+
+					fixTableCaretPos();
+				}
+			});
+
+			// Register action commands
+			each({
+				mceTableSplitCells : function(grid) {
+					grid.split();
+				},
 
-							// Setup td
-							tdElm = rows[0][0];
-							tdElm.rowSpan = rowSpan;
-							tdElm.colSpan = colSpan;
+				mceTableMergeCells : function(grid) {
+					var rowSpan, colSpan, cell;
 
-							// Merge cells
-							for (var y=0; y<rows.length; y++) {
-								for (var x=0; x<rows[y].length; x++) {
-									var html = rows[y][x].innerHTML;
-									var chk = html.replace(/[ \t\r\n]/g, "");
+					cell = ed.dom.getParent(ed.selection.getNode(), 'th,td');
+					if (cell) {
+						rowSpan = cell.rowSpan;
+						colSpan = cell.colSpan;
+					}
 
-									if (chk != "<br/>" && chk != "<br>" && chk != '<br mce_bogus="1"/>' && (x+y > 0))
-										tdElm.innerHTML += html;
+					if (!ed.dom.select('td.mceSelected,th.mceSelected').length) {
+						winMan.open({
+							url : url + '/merge_cells.htm',
+							width : 240 + parseInt(ed.getLang('table.merge_cells_delta_width', 0)),
+							height : 110 + parseInt(ed.getLang('table.merge_cells_delta_height', 0)),
+							inline : 1
+						}, {
+							rows : rowSpan,
+							cols : colSpan,
+							onaction : function(data) {
+								grid.merge(cell, data.cols, data.rows);
+							},
+							plugin_url : url
+						});
+					} else
+						grid.merge();
+				},
 
-									// Not current cell
-									if (rows[y][x] != tdElm && !rows[y][x]._deleted) {
-										var cpos = getCellPos(grid, rows[y][x]);
-										var tr = rows[y][x].parentNode;
+				mceTableInsertRowBefore : function(grid) {
+					grid.insertRow(true);
+				},
 
-										tr.removeChild(rows[y][x]);
-										rows[y][x]._deleted = true;
+				mceTableInsertRowAfter : function(grid) {
+					grid.insertRow();
+				},
 
-										// Empty TR, remove it
-										if (!tr.hasChildNodes()) {
-											tr.parentNode.removeChild(tr);
+				mceTableInsertColBefore : function(grid) {
+					grid.insertCol(true);
+				},
 
-											var lastCell = null;
-											for (var x=0; cellElm = getCell(grid, cpos.rowindex, x); x++) {
-												if (cellElm != lastCell && cellElm.rowSpan > 1)
-													cellElm.rowSpan--;
+				mceTableInsertColAfter : function(grid) {
+					grid.insertCol();
+				},
 
-												lastCell = cellElm;
-											}
+				mceTableDeleteCol : function(grid) {
+					grid.deleteCols();
+				},
 
-											if (tdElm.rowSpan > 1)
-												tdElm.rowSpan--;
-										}
-									}
-								}
-							}
+				mceTableDeleteRow : function(grid) {
+					grid.deleteRows();
+				},
 
-							// Remove all but one bogus br
-							each(ed.dom.select('br', tdElm), function(e, i) {
-								if (i > 0 && ed.dom.getAttrib(e, 'mce_bogus'))
-									ed.dom.remove(e);
-							});
+				mceTableCutRow : function(grid) {
+					clipboardRows = grid.cutRows();
+				},
 
-							break;
-						}
+				mceTableCopyRow : function(grid) {
+					clipboardRows = grid.copyRows();
+				},
 
-						tableElm = inst.dom.getParent(inst.selection.getNode(), "table");
-						inst.addVisual(tableElm);
-						inst.nodeChanged();
-					}
+				mceTablePasteRowBefore : function(grid) {
+					grid.pasteRows(clipboardRows, true);
+				},
 
-				return true;
-			}
+				mceTablePasteRowAfter : function(grid) {
+					grid.pasteRows(clipboardRows);
+				},
+
+				mceTableDelete : function(grid) {
+					grid.deleteTable();
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function() {
+					var grid = createTableGrid();
+
+					if (grid) {
+						func(grid);
+						ed.execCommand('mceRepaint');
+						cleanup();
+					}
+				});
+			});
 
-			// Pass to next handler in chain
-			return false;
+			// Register dialog commands
+			each({
+				mceInsertTable : function(val) {
+					winMan.open({
+						url : url + '/table.htm',
+						width : 400 + parseInt(ed.getLang('table.table_delta_width', 0)),
+						height : 320 + parseInt(ed.getLang('table.table_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url,
+						action : val ? val.action : 0
+					});
+				},
+
+				mceTableRowProps : function() {
+					winMan.open({
+						url : url + '/row.htm',
+						width : 400 + parseInt(ed.getLang('table.rowprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.rowprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				},
+
+				mceTableCellProps : function() {
+					winMan.open({
+						url : url + '/cell.htm',
+						width : 400 + parseInt(ed.getLang('table.cellprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.cellprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function(ui, val) {
+					func(val);
+				});
+			});
 		}
 	});
 
 	// Register plugin
 	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);
-})();
+})(tinymce);