Roo.each(merge, function(c) {
var rc = _t.rangeToRC(c.textContent);
- //Roo.log(JSON.stringify(rc))
+ //Roo.log(JSON.stringify(rc));
if (typeof(_t.grid[rc[0].r][rc[0].c]) == 'undefined') {
- _t.grid[rc[0].r][rc[0].c] = Roo.applyIf({ r : rc[0].r, c : rc[0].c }, _t.defaultCell);
+ //Roo.log(["creating empty cell for ",rc[0].r, rc[0].c ]);
+ _t.createCell(rc[0].r, rc[0].c );
+ //_t.grid[rc[0].r][rc[0].c] = //Roo.applyIf({ r : rc[0].r, c : rc[0].c }, _t.defaultCell);
}
_t.grid[rc[0].r][rc[0].c].colspan = (rc[1].c - rc[0].c) + 1;
_t.grid[rc[0].r][rc[0].c].rowspan = (rc[1].r - rc[0].r) + 1;
for(var r = (rc[0].r); r < (rc[1].r+1); r++) {
- for(var c = rc[0].c; c < (rc[1].c+1); c++) {
+ for(var cc = rc[0].c; cc < (rc[1].c+1); cc++) {
//Roo.log('adding alias : ' + r+','+c);
- _t.grid[r][c] = _t.grid[rc[0].r][rc[0].c];
+ _t.grid[r][cc] = _t.grid[rc[0].r][rc[0].c];
}
}
continue;
}
for (var c = s.c; c < s.c1;c++) {
- if (c > _t.cmax) continue;
+ if (c > _t.cmax) {
+ continue;
+ }
- if (typeof(_t.grid[r][c]) == 'undefined') _t.grid[r][c] = Roo.applyIf({ r: r , c : c }, _t.defaultCell);
+ if (typeof(_t.grid[r][c]) == 'undefined') {
+ _t.createCell(r,c);
+ //_t.grid[r][c] = Roo.applyIf({ r: r , c : c }, _t.defaultCell);
+ }
var g=_t.grid[r][c];
if (typeof(g.cls) =='undefined') {
g.cls = [];
g.styles = [];
}
- if (g.cls.indexOf(s.name) > -1) continue;
+ if (g.cls.indexOf(s.name) > -1) {
+ continue;
+ }
g.cls.push(s.name);
g.styles.push(s.dom);
},
Fore : function(ent,v) {
var col=[];
- Roo.each(v.split(':'), function(c) { col.push(Math.round(parseInt(c,16)/256)); })
+ Roo.each(v.split(':'), function(c) { col.push(Math.round(parseInt(c,16)/256)); });
ent['color'] = 'rgb(' + col.join(',') + ')';
},
Back : function(ent,v) {
var col=[];
- Roo.each(v.split(':'), function(c) { col.push(Math.round(parseInt(c,16)/256)); })
+ Roo.each(v.split(':'), function(c) { col.push(Math.round(parseInt(c,16)/256)); });
ent['background-color'] = 'rgb(' + col.join(',') + ')';
},
FontUnit : function(ent,v) {
ent['font-size'] = v + 'px';
},
FontBold : function(ent,v) {
- if (v*1 < 1) return;
+ if (v*1 < 1) { return; }
ent['font-weight'] = 'bold';
},
FontItalic : function(ent,v) {
- if (v*0 < 1) return;
+ if (v*0 < 1) { return; }
//ent['font-weight'] = 'bold';
},
FontName : function(ent,v) {
BorderColor : function(ent,v) {
var vv = v.split('-');
var col=[];
- Roo.each(vv[1].split(':'), function(c) { col.push(Math.round(parseInt(c,16)/256)); })
+ Roo.each(vv[1].split(':'), function(c) { col.push(Math.round(parseInt(c,16)/256)); });
ent['border-'+vv[0]+'-color'] = 'rgb(' + col.join(',') + ')';
}
- }
+ };
function add(e, k, v) {
//Roo.log(k,v);
e.gstyle[k] = v;
Roo.log('cell not defined:' + cell);
this.createCell(cs.r,cs.c);
}
+ // cell might not be rendered yet... so if we try and create a cell, it overrides the default formating..
+
if (typeof(this.grid[cs.r][cs.c].dom) == 'undefined') {
Roo.log('no default content for cell:' + cell);
+ Roo.log(this.grid[cs.r][cs.c]);
//this.createCell(cs.r,cs.c);
//return;
}
this.grid[cs.r][cs.c].value= v;
- this.grid[cs.r][cs.c].dom.textContent= v;
+ if (this.grid[cs.r][cs.c].dom) {
+ this.grid[cs.r][cs.c].dom.textContent= v;
+ }
+
if (typeof(vt) != 'undefined') {
this.grid[cs.r][cs.c].valueType = vt;
data = data || this.data;
for (var r = 0; r < this.rmax;r++) {
- if (typeof(this.grid[r]) == 'undefined') continue;
+ if (typeof(this.grid[r]) == 'undefined') {
+ continue;
+ }
for (var c = 0; c < this.cmax;c++) {
if (typeof(this.grid[r][c]) == 'undefined') {
continue;
}
- }
+ };
var ent = {
HAlign:"1",
ent['Unit'] = v.replace(/px/, '');
},
'font-weight' : function(ent,v) {
- if (v != 'bold') return;
+ if (v != 'bold') {
+ return;
+ }
ent['Bold'] = 1;
},
'font-style' : function(ent,v) {
- if (v != 'italic') return;
+ if (v != 'italic') {
+ return;
+ }
ent['Italic'] = 1;
}
- }
+ };
var fent = {
Unit:"10",
writeImage : function (row, col, data, width, height)
{
+ if (!data) {
+ throw "write Image called with missing data";
+ }
// our default height width is 50/50 ?!
//console.log('w='+width+',height='+height);
// <gmr:Objects>
for (var r = 0; r < this.rmax;r++) {
out += '<tr style="height:'+this.rowInfo[r]+'px;">';
for (var c = 0; c < this.cmax;c++) {
- var g = (typeof(grid[r][c]) == 'undefined') ? this.defaultCell : grid[r][c];
+ if (typeof(grid[r][c]) == 'undefined') {
+ this.createCell(r,c);
+
+ }
+ var g = grid[r][c];
- if (typeof(g.cls) =='undefined') g.cls = [];
+ if (typeof(g.cls) =='undefined') {
+ g.cls = [];
+ }
var w= calcWidth(c,g.colspan);
+
+ var value = g.value[0] == '=' ? 'CALCULATED' : g.value;
+
+ try {
+ if(
+ g.styles[0].firstElementChild.getAttribute('Format') == "D\\-MMM\\-YYYY;@" &&
+ g.value[0] != '=' &&
+ !isNaN(value * 1) &&
+ value != 0
+ ){
+ value = new Date(value * 24 * 60 * 60 * 1000 + new Date('1899-12-30').getTime()).format('d-M-Y');
+ }
+
+ } catch(e) {
+
+ }
+
out+=String.format('<td colspan="{0}" rowspan="{1}" class="{4}"><div style="{3}">{2}</div></td>',
- g.colspan, g.rowspan, g.value,
+ g.colspan, g.rowspan, value,
'overflow:hidden;' +
'width:'+w+'px;' +
{
name = name || "Missing_download_filename";
- if (this.downloadURL && this.downloadURL.charAt(this.downloadURL .length-1) != '/') {
+ if (this.downloadURL && this.downloadURL.charAt(this.downloadURL.length-1) != '/') {
this.downloadURL += '/';
}
projects / Pman.Core / blobdiff