yetangitu/SankeySheets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

updated by GasGit automation

Browse source
This commit is contained in:
Bruce McPherson 2016-06-21 15:27:48 +01:00
parent adc07ad611
commit ef09ed8c4d
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
scripts/Elementer.js
View file

@ -42,7 +42,7 @@ function Elementer() {
tdElement: "mui--text-right mui--align-middle", tdElement: "mui--text-right mui--align-middle",
tdLabel: "", tdLabel: "",
icon: "mui--text-dark-secondary material-icons", icon: "mui--text-dark-secondary material-icons",
tdIcon: "mui--align-middle", tdIcon: "", // was align middle
tdNextIcon:"mui--align-middle mui--text-right", tdNextIcon:"mui--align-middle mui--text-right",
option:"", option:"",
nav: { nav: {
@ -57,7 +57,7 @@ function Elementer() {
var defStyles_ = { var defStyles_ = {
td: "padding:3px;", td: "padding:3px;",
tdLabel: "padding:3px;", tdLabel: "padding:3px;",
tdIcon: "padding:3px;max-width:32px;", tdIcon: "width:34px;padding:0px;margin:0;padding-top:4px;padding-left:3px;", // was max-width:32, 3px padding
tdElement: "padding:3px;", tdElement: "padding:3px;",
backLabel:"position:relative;vertical-align: middle;", backLabel:"position:relative;vertical-align: middle;",
icon:"vertical-align: middle;", icon:"vertical-align: middle;",
@ -557,13 +557,12 @@ function Elementer() {
else { else {
var tr = ea(tab, "tr", "", fc.tr, fs.tr); var tr = ea(tab, "tr", "", fc.tr, fs.tr);
var used = 0;
// the icon is the first column // the icon is the first column
if (ob.icon) { if (ob.icon) {
var td = ea(tr, "td", "", fc.tdIcon, fs.tdIcon); var td = ea(tr, "td", "", fc.tdIcon, fs.tdIcon);
ea(td, "i", ob.icon, fc.icon); ea(td, "i", ob.icon, fc.icon);
used++;
} }
// now the label // now the label
@ -571,15 +570,15 @@ function Elementer() {
if (ob.label) { if (ob.label) {
var td = ea(tr, "td", "", fc.tdLabel, fs.tdLabel); var td = ea(tr, "td", "", fc.tdLabel, fs.tdLabel);
var label = ea(td, "label", DomUtils.fillLabel(ob.label), fc.label, fs.label) ; var label = ea(td, "label", DomUtils.fillLabel(ob.label), fc.label, fs.label) ;
used++; if (!ob.icon) td.colSpan = 2;
if (!ob.tag && !ob.icon) td.colSpan = 4;
} }
// the element.. if there's a tag we'll need a space for it // the element.. if there's a tag we'll need a space for it
if (ob.tag) { if (ob.tag) {
used++;
var td = ea(tr, "td", "", fc.tdElement, fs.tdElement); var td = ea(tr, "td", "", fc.tdElement, fs.tdElement);
} }
} }
@ -644,11 +643,7 @@ function Elementer() {
}); });
}); });
} }
if (!(ob.custom && ob.custom.outside)) {
// swallow up the rest
if (td)td.colSpan = 5 - used ;
}
elements_.controls[d] = elem || elemCancel; elements_.controls[d] = elem || elemCancel;
} }