projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Roo/htmleditor/BlockTd.js
[roojs1]
/
Roo
/
htmleditor
/
BlockTd.js
diff --git
a/Roo/htmleditor/BlockTd.js
b/Roo/htmleditor/BlockTd.js
index
b6022ca
..
acf00d7
100644
(file)
--- a/
Roo/htmleditor/BlockTd.js
+++ b/
Roo/htmleditor/BlockTd.js
@@
-57,6
+57,8
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
contextMenu : function(toolbar)
{
contextMenu : function(toolbar)
{
+ console.log("htmleditor.BlockTd contextMenu");
+ console.log(toolbar);
var cell = function() {
return Roo.htmleditor.Block.factory(toolbar.tb.selectedNode);
var cell = function() {
return Roo.htmleditor.Block.factory(toolbar.tb.selectedNode);
@@
-339,7
+341,7
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
*/
toObject : function()
{
*/
toObject : function()
{
-
+ console.log("htmleditor.BlockTd toObject");
var ret = {
tag : 'td',
contenteditable : 'true', // this stops cell selection from picking the table.
var ret = {
tag : 'td',
contenteditable : 'true', // this stops cell selection from picking the table.
@@
-375,6
+377,8
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
readElement : function(node)
{
readElement : function(node)
{
+ console.log("htmleditor.BlockTd readElement");
+ console.log(node);
node = node ? node : this.node ;
this.width = node.style.width;
this.colspan = Math.max(1,1*node.getAttribute('colspan'));
node = node ? node : this.node ;
this.width = node.style.width;
this.colspan = Math.max(1,1*node.getAttribute('colspan'));
@@
-407,6
+411,7
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
toTableArray : function()
{
toTableArray : function()
{
+ console.log("htmleditor.BlockTd toTableArray");
var ret = [];
var tab = this.node.closest('tr').closest('table');
Array.from(tab.rows).forEach(function(r, ri){
var ret = [];
var tab = this.node.closest('tr').closest('table');
Array.from(tab.rows).forEach(function(r, ri){
@@
-439,6
+444,8
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
if (typeof(this.colWidths[cn]) == 'undefined') {
this.colWidths[cn] = ce.style.width;
if (typeof(this.colWidths[cn]) == 'undefined') {
this.colWidths[cn] = ce.style.width;
+ console.log("colWidths " + cn);
+ console.log(ce.style.width);
if (this.colWidths[cn] != '') {
all_auto = false;
}
if (this.colWidths[cn] != '') {
all_auto = false;
}
@@
-481,6
+488,7
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
mergeRight: function()
{
mergeRight: function()
{
+ console.log("htmleditor.BlockTd mergeRight");
// get the contents of the next cell along..
var tr = this.node.closest('tr');
// get the contents of the next cell along..
var tr = this.node.closest('tr');
@@
-598,6
+606,8
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
},
updateWidths : function(table)
{
},
updateWidths : function(table)
{
+ console.log("htmleditor.BlockTd updateWidths");
+ console.log(table);
for(var r = 0 ; r < table.length; r++) {
for(var c = 0 ; c < table[r].length; c++) {
for(var r = 0 ; r < table.length; r++) {
for(var c = 0 ; c < table[r].length; c++) {
@@
-616,6
+626,11
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
},
normalizeWidths : function(table)
{
},
normalizeWidths : function(table)
{
+ console.log("htmleditor.BlockTd normalizeWidths");
+ console.log("colWidths 0");
+ console.log(this.colWidths[0]);
+ console.log("colWidths 1");
+ console.log(this.colWidths[1]);
if (this.colWidths[0] === false) {
var nw = 100.0 / this.colWidths.length;
if (this.colWidths[0] === false) {
var nw = 100.0 / this.colWidths.length;
@@
-662,7
+677,9
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
shrinkColumn : function()
{
shrinkColumn : function()
{
+ console.log("htmleditor.BlockTd shrinkColumn");
var table = this.toTableArray();
var table = this.toTableArray();
+ console.log(table);
this.normalizeWidths(table);
var col = this.cellData.col;
var nw = this.colWidths[col] * 0.8;
this.normalizeWidths(table);
var col = this.cellData.col;
var nw = this.colWidths[col] * 0.8;
@@
-682,7
+699,9
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
},
growColumn : function()
{
},
growColumn : function()
{
+ console.log("htmleditor.BlockTd growColumn");
var table = this.toTableArray();
var table = this.toTableArray();
+ console.log(table);
this.normalizeWidths(table);
var col = this.cellData.col;
var nw = this.colWidths[col] * 1.2;
this.normalizeWidths(table);
var col = this.cellData.col;
var nw = this.colWidths[col] * 1.2;