Changeset 672
- Timestamp:
- 2007-08-17 09:36:47 (3 years ago)
- Location:
- FCKeditor/trunk/editor
- Files:
-
- 60 modified
-
lang/af.js (modified) (1 diff)
-
lang/ar.js (modified) (1 diff)
-
lang/bg.js (modified) (1 diff)
-
lang/bn.js (modified) (1 diff)
-
lang/bs.js (modified) (1 diff)
-
lang/ca.js (modified) (1 diff)
-
lang/cs.js (modified) (1 diff)
-
lang/da.js (modified) (1 diff)
-
lang/de.js (modified) (1 diff)
-
lang/el.js (modified) (1 diff)
-
lang/en-au.js (modified) (1 diff)
-
lang/en-ca.js (modified) (1 diff)
-
lang/en.js (modified) (1 diff)
-
lang/en-uk.js (modified) (1 diff)
-
lang/eo.js (modified) (1 diff)
-
lang/es.js (modified) (1 diff)
-
lang/et.js (modified) (1 diff)
-
lang/eu.js (modified) (1 diff)
-
lang/fa.js (modified) (1 diff)
-
lang/fi.js (modified) (1 diff)
-
lang/fo.js (modified) (1 diff)
-
lang/fr.js (modified) (1 diff)
-
lang/gl.js (modified) (1 diff)
-
lang/he.js (modified) (1 diff)
-
lang/hi.js (modified) (1 diff)
-
lang/hr.js (modified) (1 diff)
-
lang/hu.js (modified) (1 diff)
-
lang/it.js (modified) (1 diff)
-
lang/ja.js (modified) (1 diff)
-
lang/km.js (modified) (1 diff)
-
lang/ko.js (modified) (1 diff)
-
lang/lt.js (modified) (1 diff)
-
lang/lv.js (modified) (1 diff)
-
lang/mn.js (modified) (1 diff)
-
lang/ms.js (modified) (1 diff)
-
lang/nb.js (modified) (1 diff)
-
lang/nl.js (modified) (1 diff)
-
lang/no.js (modified) (1 diff)
-
lang/pl.js (modified) (1 diff)
-
lang/pt-br.js (modified) (1 diff)
-
lang/pt.js (modified) (1 diff)
-
lang/ro.js (modified) (1 diff)
-
lang/ru.js (modified) (1 diff)
-
lang/sk.js (modified) (1 diff)
-
lang/sl.js (modified) (1 diff)
-
lang/sr.js (modified) (1 diff)
-
lang/sr-latn.js (modified) (1 diff)
-
lang/sv.js (modified) (1 diff)
-
lang/th.js (modified) (1 diff)
-
lang/tr.js (modified) (1 diff)
-
lang/uk.js (modified) (1 diff)
-
lang/vi.js (modified) (1 diff)
-
lang/zh-cn.js (modified) (1 diff)
-
lang/zh.js (modified) (1 diff)
-
plugins/dragresizetable/fckplugin.js (modified) (5 diffs)
-
_source/commandclasses/fcktablecommand.js (modified) (2 diffs)
-
_source/internals/fckcommands.js (modified) (1 diff)
-
_source/internals/fck_contextmenu.js (modified) (1 diff)
-
_source/internals/fckdomtools.js (modified) (1 diff)
-
_source/internals/fcktablehandler.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
FCKeditor/trunk/editor/lang/af.js
r174 r672 117 117 DeleteCells : "Cell verweider", 118 118 MergeCells : "Cell verenig", 119 SplitCell : "Cell verdeel",120 119 TableDelete : "Tabel verweider", 121 120 CellProperties : "Cell eienskappe", -
FCKeditor/trunk/editor/lang/ar.js
r174 r672 117 117 DeleteCells : "حذف خلايا", 118 118 MergeCells : "دمج خلايا", 119 SplitCell : "تقسيم خلية",120 119 TableDelete : "حذف الجدول", 121 120 CellProperties : "خصائص الخلية", -
FCKeditor/trunk/editor/lang/bg.js
r174 r672 117 117 DeleteCells : "Изтрий клетките", 118 118 MergeCells : "Обедини клетките", 119 SplitCell : "Раздели клетката",120 119 TableDelete : "Изтрий таблицата", 121 120 CellProperties : "Параметри на клетката", -
FCKeditor/trunk/editor/lang/bn.js
r174 r672 117 117 DeleteCells : "সেল মুছে দাও", 118 118 MergeCells : "সেল জোড়া দাও", 119 SplitCell : "সেল আলাদা কর",120 119 TableDelete : "টেবিল ডিলীট কর", 121 120 CellProperties : "সেলের প্রোপার্টিজ", -
FCKeditor/trunk/editor/lang/bs.js
r174 r672 117 117 DeleteCells : "Briši æelije", 118 118 MergeCells : "Spoji æelije", 119 SplitCell : "Razdvoji æeliju",120 119 TableDelete : "Delete Table", //MISSING 121 120 CellProperties : "Svojstva æelije", -
FCKeditor/trunk/editor/lang/ca.js
r340 r672 117 117 DeleteCells : "Suprimeix les cel·les", 118 118 MergeCells : "Fusiona les cel·les", 119 SplitCell : "Separa les cel·les",120 119 TableDelete : "Suprimeix la taula", 121 120 CellProperties : "Propietats de la cel·la", -
FCKeditor/trunk/editor/lang/cs.js
r372 r672 117 117 DeleteCells : "Smazat buňky", 118 118 MergeCells : "Sloučit buňky", 119 SplitCell : "Rozdělit buňku",120 119 TableDelete : "Smazat tabulku", 121 120 CellProperties : "Vlastnosti buňky", -
FCKeditor/trunk/editor/lang/da.js
r174 r672 117 117 DeleteCells : "Slet celle", 118 118 MergeCells : "Flet celler", 119 SplitCell : "Opdel celle",120 119 TableDelete : "Slet tabel", 121 120 CellProperties : "Egenskaber for celle", -
FCKeditor/trunk/editor/lang/de.js
r174 r672 117 117 DeleteCells : "Zelle löschen", 118 118 MergeCells : "Zellen vereinen", 119 SplitCell : "Zelle teilen",120 119 TableDelete : "Tabelle löschen", 121 120 CellProperties : "Zellen Eigenschaften", -
FCKeditor/trunk/editor/lang/el.js
r174 r672 117 117 DeleteCells : "Διαγραφή Κελιών", 118 118 MergeCells : "Ενοποίηση Κελιών", 119 SplitCell : "Διαχωρισμός Κελιού",120 119 TableDelete : "Διαγραφή πίνακα", 121 120 CellProperties : "Ιδιότητες Κελιού", -
FCKeditor/trunk/editor/lang/en-au.js
r643 r672 121 121 DeleteCells : "Delete Cells", 122 122 MergeCells : "Merge Cells", 123 SplitCell : "Split Cell", 123 MergeRight : "Merge Right", 124 MergeDown : "Merge Down", 124 125 TableDelete : "Delete Table", 126 HorizontalSplitCell : "Split Cell Horizontally", 127 VerticalSplitCell : "Split Cell Vertically", 125 128 CellProperties : "Cell Properties", 126 129 TableProperties : "Table Properties", -
FCKeditor/trunk/editor/lang/en-ca.js
r643 r672 121 121 DeleteCells : "Delete Cells", 122 122 MergeCells : "Merge Cells", 123 SplitCell : "Split Cell", 123 MergeRight : "Merge Right", 124 MergeDown : "Merge Down", 125 HorizontalSplitCell : "Split Cell Horizontally", 126 VerticalSplitCell : "Split Cell Vertically", 124 127 TableDelete : "Delete Table", 125 128 CellProperties : "Cell Properties", -
FCKeditor/trunk/editor/lang/en.js
r643 r672 121 121 DeleteCells : "Delete Cells", 122 122 MergeCells : "Merge Cells", 123 SplitCell : "Split Cell", 123 MergeRight : "Merge Right", 124 MergeDown : "Merge Down", 125 HorizontalSplitCell : "Split Cell Horizontally", 126 VerticalSplitCell : "Split Cell Vertically", 124 127 TableDelete : "Delete Table", 125 128 CellProperties : "Cell Properties", -
FCKeditor/trunk/editor/lang/en-uk.js
r643 r672 121 121 DeleteCells : "Delete Cells", 122 122 MergeCells : "Merge Cells", 123 SplitCell : "Split Cell", 123 MergeRight : "Merge Right", 124 MergeDown : "Merge Down", 125 HorizontalSplitCell : "Split Cell Horizontally", 126 VerticalSplitCell : "Split Cell Vertically", 124 127 TableDelete : "Delete Table", 125 128 CellProperties : "Cell Properties", -
FCKeditor/trunk/editor/lang/eo.js
r174 r672 117 117 DeleteCells : "Forigi Ĉelojn", 118 118 MergeCells : "Kunfandi Ĉelojn", 119 SplitCell : "Dividi Ĉelojn",120 119 TableDelete : "Delete Table", //MISSING 121 120 CellProperties : "Atributoj de Ĉelo", -
FCKeditor/trunk/editor/lang/es.js
r174 r672 117 117 DeleteCells : "Eliminar Celdas", 118 118 MergeCells : "Combinar Celdas", 119 SplitCell : "Dividir Celda",120 119 TableDelete : "Eliminar Tabla", 121 120 CellProperties : "Propiedades de Celda", -
FCKeditor/trunk/editor/lang/et.js
r260 r672 117 117 DeleteCells : "Eemalda lahtrid", 118 118 MergeCells : "Ühenda lahtrid", 119 SplitCell : "Lahuta lahtrid",120 119 TableDelete : "Kustuta tabel", 121 120 CellProperties : "Lahtri atribuudid", -
FCKeditor/trunk/editor/lang/eu.js
r174 r672 118 118 DeleteCells : "Kendu Gelaxkak", 119 119 MergeCells : "Batu Gelaxkak", 120 SplitCell : "Zatitu Gelaxka",121 120 TableDelete : "Ezabatu Taula", 122 121 CellProperties : "Gelaxkaren Ezaugarriak", -
FCKeditor/trunk/editor/lang/fa.js
r326 r672 117 117 DeleteCells : "حذف سلولها", 118 118 MergeCells : "ادغام سلولها", 119 SplitCell : "جداسازی سلول",120 119 TableDelete : "پاککردن جدول", 121 120 CellProperties : "ویژگیهای سلول", -
FCKeditor/trunk/editor/lang/fi.js
r362 r672 117 117 DeleteCells : "Poista solut", 118 118 MergeCells : "Yhdistä solut", 119 SplitCell : "Jaa solu",120 119 TableDelete : "Poista taulu", 121 120 CellProperties : "Solun ominaisuudet", -
FCKeditor/trunk/editor/lang/fo.js
r174 r672 117 117 DeleteCells : "Strika meskar", 118 118 MergeCells : "Flætta meskar", 119 SplitCell : "Být sundur meskar",120 119 TableDelete : "Strika tabell", 121 120 CellProperties : "Meskueginleikar", -
FCKeditor/trunk/editor/lang/fr.js
r174 r672 117 117 DeleteCells : "Supprimer des cellules", 118 118 MergeCells : "Fusionner les cellules", 119 SplitCell : "Scinder les cellules",120 119 TableDelete : "Supprimer le tableau", 121 120 CellProperties : "Propriétés de cellule", -
FCKeditor/trunk/editor/lang/gl.js
r174 r672 117 117 DeleteCells : "Borrar Cela", 118 118 MergeCells : "Unir Celas", 119 SplitCell : "Partir Celas",120 119 TableDelete : "Borrar Táboa", 121 120 CellProperties : "Propriedades da Cela", -
FCKeditor/trunk/editor/lang/he.js
r372 r672 117 117 DeleteCells : "מחיקת תאים", 118 118 MergeCells : "מיזוג תאים", 119 SplitCell : "פיצול תאים",120 119 TableDelete : "מחק טבלה", 121 120 CellProperties : "תכונות התא", -
FCKeditor/trunk/editor/lang/hi.js
r174 r672 117 117 DeleteCells : "सॅल डिलीट करें", 118 118 MergeCells : "सॅल मिलायें", 119 SplitCell : "सॅल अलग करें",120 119 TableDelete : "टेबल डिलीट करें", 121 120 CellProperties : "सॅल प्रॉपर्टीज़", -
FCKeditor/trunk/editor/lang/hr.js
r174 r672 117 117 DeleteCells : "Izbriši ćelije", 118 118 MergeCells : "Spoji ćelije", 119 SplitCell : "Razdvoji ćelije",120 119 TableDelete : "Izbriši tablicu", 121 120 CellProperties : "Svojstva ćelije", -
FCKeditor/trunk/editor/lang/hu.js
r174 r672 117 117 DeleteCells : "Cellák törlése", 118 118 MergeCells : "Cellák egyesítése", 119 SplitCell : "Cella szétválasztása",120 119 TableDelete : "Táblázat törlése", 121 120 CellProperties : "Cella tulajdonságai", -
FCKeditor/trunk/editor/lang/it.js
r174 r672 117 117 DeleteCells : "Elimina celle", 118 118 MergeCells : "Unisce celle", 119 SplitCell : "Dividi celle",120 119 TableDelete : "Cancella Tabella", 121 120 CellProperties : "Proprietà cella", -
FCKeditor/trunk/editor/lang/ja.js
r174 r672 117 117 DeleteCells : "セル削除", 118 118 MergeCells : "セル結合", 119 SplitCell : "セル分割",120 119 TableDelete : "テーブル削除", 121 120 CellProperties : "セル プロパティ", -
FCKeditor/trunk/editor/lang/km.js
r174 r672 117 117 DeleteCells : "លប់សែល", 118 118 MergeCells : "បញ្ជូលសែល", 119 SplitCell : "ផ្តាច់សែល",120 119 TableDelete : "លប់តារាង", 121 120 CellProperties : "ការកំណត់សែល", -
FCKeditor/trunk/editor/lang/ko.js
r174 r672 117 117 DeleteCells : "셀 삭제", 118 118 MergeCells : "셀 합치기", 119 SplitCell : "셀 나누기",120 119 TableDelete : "Delete Table", //MISSING 121 120 CellProperties : "셀 속성", -
FCKeditor/trunk/editor/lang/lt.js
r174 r672 117 117 DeleteCells : "Šalinti langelius", 118 118 MergeCells : "Sujungti langelius", 119 SplitCell : "Skaidyti langelius",120 119 TableDelete : "Šalinti lentelę", 121 120 CellProperties : "Langelio savybės", -
FCKeditor/trunk/editor/lang/lv.js
r174 r672 117 117 DeleteCells : "Dzēst rūtiņas", 118 118 MergeCells : "Apvienot rūtiņas", 119 SplitCell : "Sadalīt rūtiņu",120 119 TableDelete : "Dzēst tabulu", 121 120 CellProperties : "Rūtiņas īpašības", -
FCKeditor/trunk/editor/lang/mn.js
r174 r672 117 117 DeleteCells : "Нүх устгах", 118 118 MergeCells : "Нүх нэгтэх", 119 SplitCell : "Нүх тусгайрлах",120 119 TableDelete : "Delete Table", //MISSING 121 120 CellProperties : "Хоосон зайн шинж чанар", -
FCKeditor/trunk/editor/lang/ms.js
r174 r672 117 117 DeleteCells : "Buangkan Sel-sel", 118 118 MergeCells : "Cantumkan Sel-sel", 119 SplitCell : "Bahagikan Sel",120 119 TableDelete : "Delete Table", //MISSING 121 120 CellProperties : "Ciri-ciri Sel", -
FCKeditor/trunk/editor/lang/nb.js
r272 r672 117 117 DeleteCells : "Slett celler", 118 118 MergeCells : "Slå sammen celler", 119 SplitCell : "Splitt celler",120 119 TableDelete : "Slett tabell", 121 120 CellProperties : "Celleegenskaper", -
FCKeditor/trunk/editor/lang/nl.js
r174 r672 117 117 DeleteCells : "Cellen verwijderen", 118 118 MergeCells : "Cellen samenvoegen", 119 SplitCell : "Cellen splitsen",120 119 TableDelete : "Tabel verwijderen", 121 120 CellProperties : "Eigenschappen cel", -
FCKeditor/trunk/editor/lang/no.js
r272 r672 117 117 DeleteCells : "Slett celler", 118 118 MergeCells : "Slå sammen celler", 119 SplitCell : "Splitt celler",120 119 TableDelete : "Slett tabell", 121 120 CellProperties : "Celleegenskaper", -
FCKeditor/trunk/editor/lang/pl.js
r174 r672 117 117 DeleteCells : "Usuń komórki", 118 118 MergeCells : "Połącz komórki", 119 SplitCell : "Podziel komórkę",120 119 TableDelete : "Usuń tabelę", 121 120 CellProperties : "Właściwości komórki", -
FCKeditor/trunk/editor/lang/pt-br.js
r174 r672 117 117 DeleteCells : "Remover Células", 118 118 MergeCells : "Mesclar Células", 119 SplitCell : "Dividir Célular",120 119 TableDelete : "Apagar Tabela", 121 120 CellProperties : "Formatar Célula", -
FCKeditor/trunk/editor/lang/pt.js
r174 r672 117 117 DeleteCells : "Eliminar Célula", 118 118 MergeCells : "Unir Células", 119 SplitCell : "Dividir Célula",120 119 TableDelete : "Eliminar Tabela", 121 120 CellProperties : "Propriedades da Célula", -
FCKeditor/trunk/editor/lang/ro.js
r174 r672 117 117 DeleteCells : "Şterge celule", 118 118 MergeCells : "Uneşte celule", 119 SplitCell : "Împarte celulă",120 119 TableDelete : "Şterge tabel", 121 120 CellProperties : "Proprietăţile celulei", -
FCKeditor/trunk/editor/lang/ru.js
r174 r672 117 117 DeleteCells : "Удалить ячейки", 118 118 MergeCells : "Соединить ячейки", 119 SplitCell : "Разбить ячейку",120 119 TableDelete : "Удалить таблицу", 121 120 CellProperties : "Свойства ячейки", -
FCKeditor/trunk/editor/lang/sk.js
r174 r672 117 117 DeleteCells : "Vymazať bunky", 118 118 MergeCells : "Zlúčiť bunky", 119 SplitCell : "Rozdeliť bunku",120 119 TableDelete : "Vymazať tabuľku", 121 120 CellProperties : "Vlastnosti bunky", -
FCKeditor/trunk/editor/lang/sl.js
r174 r672 117 117 DeleteCells : "Izbriši celice", 118 118 MergeCells : "Združi celice", 119 SplitCell : "Razdeli celico",120 119 TableDelete : "Izbriši tabelo", 121 120 CellProperties : "Lastnosti celice", -
FCKeditor/trunk/editor/lang/sr.js
r174 r672 117 117 DeleteCells : "Обриши ћелије", 118 118 MergeCells : "Спој ћелије", 119 SplitCell : "Раздвоји ћелије",120 119 TableDelete : "Delete Table", //MISSING 121 120 CellProperties : "Особине ћелије", -
FCKeditor/trunk/editor/lang/sr-latn.js
r174 r672 117 117 DeleteCells : "Obriši ćelije", 118 118 MergeCells : "Spoj celije", 119 SplitCell : "Razdvoji celije",120 119 TableDelete : "Delete Table", //MISSING 121 120 CellProperties : "Osobine celije", -
FCKeditor/trunk/editor/lang/sv.js
r305 r672 117 117 DeleteCells : "Radera celler", 118 118 MergeCells : "Sammanfoga celler", 119 SplitCell : "Separera celler",120 119 TableDelete : "Radera tabell", 121 120 CellProperties : "Cellegenskaper", -
FCKeditor/trunk/editor/lang/th.js
r215 r672 117 117 DeleteCells : "ลบช่อง", 118 118 MergeCells : "ผสานช่อง", 119 SplitCell : "แยกช่อง",120 119 TableDelete : "ลบตาราง", 121 120 CellProperties : "คุณสมบัติของช่อง", -
FCKeditor/trunk/editor/lang/tr.js
r174 r672 117 117 DeleteCells : "Hücre Sil", 118 118 MergeCells : "Hücreleri Birleştir", 119 SplitCell : "Hücre Böl",120 119 TableDelete : "Tabloyu Sil", 121 120 CellProperties : "Hücre Özellikleri", -
FCKeditor/trunk/editor/lang/uk.js
r305 r672 117 117 DeleteCells : "Видалити комірки", 118 118 MergeCells : "Об'єднати комірки", 119 SplitCell : "Роз'єднати комірку",120 119 TableDelete : "Видалити таблицю", 121 120 CellProperties : "Властивості комірки", -
FCKeditor/trunk/editor/lang/vi.js
r174 r672 117 117 DeleteCells : "Xoá Ô", 118 118 MergeCells : "Trộn Ô", 119 SplitCell : "Chia Ô",120 119 TableDelete : "Xóa Bảng", 121 120 CellProperties : "Thuộc tính Ô", -
FCKeditor/trunk/editor/lang/zh-cn.js
r643 r672 121 121 DeleteCells : "删除单元格", 122 122 MergeCells : "合并单元格", 123 SplitCell : "拆分单元格", 123 MergeRight : "右合并单元格", 124 MergeDown : "下合并单元格", 125 HorizontalSplitCell : "橫拆分单元格", 126 VerticalSplitCell : "縱拆分单元格", 124 127 TableDelete : "删除表格", 125 128 CellProperties : "单元格属性", -
FCKeditor/trunk/editor/lang/zh.js
r643 r672 121 121 DeleteCells : "刪除儲存格", 122 122 MergeCells : "合併儲存格", 123 SplitCell : "分割儲存格", 123 MergeRight : "向右合併儲存格", 124 MergeDown : "向下合併儲存格", 125 HorizontalSplitCell : "橫向分割儲存格", 126 VerticalSplitCell : "縱向分割儲存格", 124 127 TableDelete : "刪除表格", 125 128 CellProperties : "儲存格屬性", -
FCKeditor/trunk/editor/plugins/dragresizetable/fckplugin.js
r666 r672 77 77 for ( var i = 0 ; i <= this._LeftCell.cellIndex ; i++ ) 78 78 { 79 var colSpan = parseInt( row.cells.item( i ).colSpan, 10 );79 var colSpan = row.cells.item( i ).colSpan ; 80 80 if ( isNaN( colSpan ) ) 81 81 colSpan = 1 ; … … 155 155 var cell = row.cells.item( c ) ; 156 156 var width = FCKDragTableHandler._GetCellWidth( table, cell ) ; 157 var colSpan = parseInt( cell.colSpan, 10 );157 var colSpan = cell.colSpan ; 158 158 if ( isNaN( colSpan ) ) 159 159 colSpan = 1 ; … … 212 212 { 213 213 var cell = row.cells.item( c ) ; 214 var colSpan = parseInt( cell.colSpan, 10 );214 var colSpan = cell.colSpan ; 215 215 if ( isNaN( colSpan ) ) 216 216 colSpan = 1 ; … … 260 260 261 261 var cssRuntime = cell.style.padding ; 262 if ( !isNaN( parseInt( cssRuntime, 10 )) )262 if ( isFinite( cssRuntime ) ) 263 263 cssGuess = parseInt( cssRuntime, 10 ) * 2 ; 264 264 else 265 265 { 266 266 cssRuntime = cell.style.paddingLeft ; 267 if ( !isNaN( parseInt( cssRuntime, 10 )) )267 if ( isFinite( cssRuntime ) ) 268 268 cssGuess = parseInt( cssRuntime, 10 ) ; 269 269 cssRuntime = cell.style.paddingRight ; 270 if ( !isNaN( parseInt( cssRuntime, 10 )) )270 if ( isFinite( cssRuntime ) ) 271 271 cssGuess += parseInt( cssRuntime, 10 ) ; 272 272 } … … 287 287 "_GetCellWidth" : function( table, cell ) 288 288 { 289 var clientWidth = parseInt( cell.clientWidth, 10 );289 var clientWidth = cell.clientWidth ; 290 290 if ( isNaN( clientWidth ) ) 291 291 clientWidth = 0 ; -
FCKeditor/trunk/editor/_source/commandclasses/fcktablecommand.js
r646 r672 32 32 FCKUndo.SaveUndoStep() ; 33 33 34 if ( FCKBrowserInfo.IsIE ) 35 { 36 switch ( this.Name ) 37 { 38 case 'TableMergeRight' : 39 return FCKTableHandler.MergeRight() ; 40 case 'TableMergeDown' : 41 return FCKTableHandler.MergeDown() ; 42 } 43 } 44 34 45 switch ( this.Name ) 35 46 { … … 64 75 FCKTableHandler.MergeCells() ; 65 76 break ; 66 case 'TableSplitCell' : 67 FCKTableHandler.SplitCell() ; 77 case 'TableHorizontalSplitCell' : 78 FCKTableHandler.HorizontalSplitCell() ; 79 break ; 80 case 'TableVerticalSplitCell' : 81 FCKTableHandler.VerticalSplitCell() ; 68 82 break ; 69 83 case 'TableDelete' : -
FCKeditor/trunk/editor/_source/internals/fckcommands.js
r643 r672 90 90 case 'TableDeleteCells' : oCommand = new FCKTableCommand('TableDeleteCells') ; break ; 91 91 case 'TableMergeCells' : oCommand = new FCKTableCommand('TableMergeCells') ; break ; 92 case 'TableSplitCell' : oCommand = new FCKTableCommand('TableSplitCell') ; break ; 92 case 'TableMergeRight' : oCommand = new FCKTableCommand('TableMergeRight') ; break ; 93 case 'TableMergeDown' : oCommand = new FCKTableCommand('TableMergeDown') ; break ; 94 case 'TableHorizontalSplitCell' : oCommand = new FCKTableCommand('TableHorizontalSplitCell') ; break ; 95 case 'TableVerticalSplitCell' : oCommand = new FCKTableCommand('TableVerticalSplitCell') ; break ; 93 96 case 'TableDelete' : oCommand = new FCKTableCommand('TableDelete') ; break ; 94 97 -
FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js
r643 r672 74 74 oItem.AddItem( 'TableInsertCellAfter' , FCKLang.InsertCellAfter, 58 ) ; 75 75 oItem.AddItem( 'TableDeleteCells' , FCKLang.DeleteCells, 59 ) ; 76 oItem.AddItem( 'TableMergeCells' , FCKLang.MergeCells, 60 ) ; 77 oItem.AddItem( 'TableSplitCell' , FCKLang.SplitCell, 61 ) ; 76 if ( FCKBrowserInfo.IsIE ) 77 { 78 oItem.AddItem( 'TableMergeRight' , FCKLang.MergeRight, 60 ) ; 79 oItem.AddItem( 'TableMergeDown' , FCKLang.MergeDown, 60 ) ; 80 } 81 else 82 oItem.AddItem( 'TableMergeCells' , FCKLang.MergeCells, 60 ) ; 83 oItem.AddItem( 'TableHorizontalSplitCell' , FCKLang.HorizontalSplitCell, 61 ) ; 84 oItem.AddItem( 'TableVerticalSplitCell' , FCKLang.VerticalSplitCell, 61 ) ; 78 85 oItem.AddSeparator() ; 79 86 oItem.AddItem( 'TableCellProp' , FCKLang.CellProperties, 57 ) ; -
FCKeditor/trunk/editor/_source/internals/fckdomtools.js
r659 r672 362 362 this.PaddingNode = null ; 363 363 } 364 }, 365 366 GetPositionalCellIndex : function( cell ) 367 { 368 var row = cell.parentNode ; 369 var retval = 0 ; 370 for ( var i = 0 ; i < cell.cellIndex ; i++ ) 371 retval += isFinite( row.cells[i].colSpan ) ? row.cells[i].colSpan : 1 ; 372 return retval ; 364 373 } 365 374 } ; -
FCKeditor/trunk/editor/_source/internals/fcktablehandler.js
r495 r672 291 291 } 292 292 293 FCKTableHandler.SplitCell = function() 293 FCKTableHandler.MergeRight = function() 294 { 295 if ( ! FCKBrowserInfo.IsIE ) 296 { 297 alert( 'This method should be called in IE only.' ) ; 298 return ; 299 } 300 var cells = FCKTableHandler.GetSelectedCells() ; 301 if ( ! ( cells && cells.length > 0 ) ) 302 return ; 303 304 var currentCell = cells[0] ; 305 var nextCell = currentCell.parentNode.cells[currentCell.cellIndex + 1] ; 306 var nextColSpan = nextCell.colSpan ; 307 if ( isNaN( nextColSpan ) ) 308 nextColSpan = 1 ; 309 310 if ( ! nextCell ) 311 return ; 312 313 var cellContents = FCK.EditorDocument.createDocumentFragment() ; 314 while ( nextCell.childNodes.length > 0 ) 315 cellContents.appendChild( nextCell.removeChild( nextCell.firstChild ) ) ; 316 317 nextCell.parentNode.removeChild( nextCell ) ; 318 if ( isNaN( currentCell.colSpan ) ) 319 currentCell.colSpan = 1 ; 320 currentCell.colSpan += nextColSpan ; 321 322 currentCell.appendChild( cellContents ) ; 323 } 324 325 FCKTableHandler.MergeDown = function() 326 { 327 if ( ! FCKBrowserInfo.IsIE ) 328 { 329 alert( 'This method should be called in IE only.' ) ; 330 return ; 331 } 332 var cells = FCKTableHandler.GetSelectedCells() ; 333 if ( ! ( cells && cells.length > 0 ) ) 334 return ; 335 336 var currentCell = cells[0] ; 337 var currentRowSpan = currentCell.rowSpan ; 338 if ( isNaN( currentRowSpan ) ) 339 currentRowSpan = 1 ; 340 var nextRow = currentCell.parentNode.parentNode.rows[currentCell.parentNode.rowIndex + currentRowSpan ] ; 341 if ( nextRow ) 342 { 343 var positionalIndex = FCKDomTools.GetPositionalCellIndex( currentCell ) ; 344 var equivalentCell = null ; 345 var equivalentPositionalIndex = 0 ; 346 for ( var i = 0 ; i < nextRow.cells.length ; i++ ) 347 { 348 var colSpan = nextRow.cells[i].colSpan ; 349 if ( isNaN( colSpan ) ) 350 colSpan = 1 ; 351 equivalentPositionalIndex += colSpan ; 352 if ( equivalentPositionalIndex >= positionalIndex ) 353 { 354 equivalentCell = nextRow.cells[i] ; 355 break ; 356 } 357 } 358 359 if ( ! equivalentCell ) 360 return ; 361 362 var equivalentRowSpan = equivalentCell.rowSpan ; 363 if ( isNaN( equivalentRowSpan ) ) 364 equivalentRowSpan = 1 ; 365 366 var cellContents = FCK.EditorDocument.createDocumentFragment() ; 367 while ( equivalentCell.childNodes.length > 0 ) 368 cellContents.appendChild( equivalentCell.removeChild( equivalentCell.firstChild ) ) ; 369 if ( cellContents.childNodes.length > 0 ) 370 cellContents.insertBefore( FCK.EditorDocument.createElement( 'br' ), cellContents.firstChild ) ; 371 if ( isNaN( currentCell.rowSpan ) ) 372 currentCell.rowSpan = 1 ; 373 currentCell.rowSpan += equivalentRowSpan ; 374 currentCell.appendChild( cellContents ) ; 375 equivalentCell.parentNode.removeChild( equivalentCell ) ; 376 } 377 } 378 379 FCKTableHandler.HorizontalSplitCell = function() 294 380 { 295 381 // Check that just one cell is selected, otherwise return. … … 319 405 } 320 406 } 407 } 408 409 FCKTableHandler.VerticalSplitCell = function() 410 { 411 // TODO 321 412 } 322 413