Browse Source

Merge pull request #635 in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'd2faea91b70383f974280c84ba2d607a4816900b':
  update
  update
es6
guy 6 years ago
parent
commit
58ae86b406
  1. 11
      dist/base.js
  2. 11
      dist/bundle.js
  3. 50
      dist/bundle.min.js
  4. 11
      dist/fineui.js
  5. 50
      dist/fineui.min.js
  6. 11
      dist/fineui_without_jquery_polyfill.js
  7. 2
      dist/utils.min.js
  8. 11
      src/base/layer/layer.popup.js

11
dist/base.js vendored

@ -5863,7 +5863,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
maxWidth: "auto", maxWidth: "auto",
minWidth: 100, minWidth: 100,
// maxHeight: 200, // maxHeight: 200,
minHeight: 25, minHeight: 24,
lgap: 0, lgap: 0,
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
@ -6007,10 +6007,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}); this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
}, },
setValue: function (selectedValues) { setValue: function (selectedValues) {

11
dist/bundle.js vendored

@ -41093,7 +41093,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
maxWidth: "auto", maxWidth: "auto",
minWidth: 100, minWidth: 100,
// maxHeight: 200, // maxHeight: 200,
minHeight: 25, minHeight: 24,
lgap: 0, lgap: 0,
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
@ -41237,10 +41237,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}); this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
}, },
setValue: function (selectedValues) { setValue: function (selectedValues) {

50
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

11
dist/fineui.js vendored

@ -41334,7 +41334,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
maxWidth: "auto", maxWidth: "auto",
minWidth: 100, minWidth: 100,
// maxHeight: 200, // maxHeight: 200,
minHeight: 25, minHeight: 24,
lgap: 0, lgap: 0,
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
@ -41478,10 +41478,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}); this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
}, },
setValue: function (selectedValues) { setValue: function (selectedValues) {

50
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

11
dist/fineui_without_jquery_polyfill.js vendored

@ -29719,7 +29719,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
maxWidth: "auto", maxWidth: "auto",
minWidth: 100, minWidth: 100,
// maxHeight: 200, // maxHeight: 200,
minHeight: 25, minHeight: 24,
lgap: 0, lgap: 0,
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
@ -29863,10 +29863,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}); this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
}, },
setValue: function (selectedValues) { setValue: function (selectedValues) {

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

11
src/base/layer/layer.popup.js

@ -10,7 +10,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
maxWidth: "auto", maxWidth: "auto",
minWidth: 100, minWidth: 100,
// maxHeight: 200, // maxHeight: 200,
minHeight: 25, minHeight: 24,
lgap: 0, lgap: 0,
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
@ -154,10 +154,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}); this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
}, },
setValue: function (selectedValues) { setValue: function (selectedValues) {

Loading…
Cancel
Save