Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui

# Conflicts:
#	dist/bundle.ie.min.js
#	dist/bundle.min.js
#	dist/fineui.ie.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
master
windy 6 years ago
parent
commit
2abd405354
  1. 2
      dist/base.js
  2. 9
      dist/bundle.ie.js
  3. 9
      dist/bundle.js
  4. 7
      dist/core.js
  5. 9
      dist/fineui.ie.js
  6. 9
      dist/fineui.js
  7. 9
      dist/fineui_without_jquery_polyfill.js
  8. 7
      dist/utils.js
  9. 2
      src/base/pane.js
  10. 7
      src/core/base.js

2
dist/base.js vendored

@ -256,7 +256,7 @@ BI.Pane = BI.inherit(BI.Widget, {
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
height: 30, height: 30,
width: 30, width: 30,
hgap: 5.25, hgap: 5,
vgap: 2.5, vgap: 2.5,
items: [{ items: [{
type: "bi.layout", type: "bi.layout",

9
dist/bundle.ie.js vendored

@ -10585,6 +10585,13 @@ if (!_global.BI) {
return sb; return sb;
}, },
init: function () {
// 先把准备环境准备好
while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()();
}
},
has: function (obj, keys) { has: function (obj, keys) {
if (BI.isArray(keys)) { if (BI.isArray(keys)) {
if (keys.length === 0) { if (keys.length === 0) {
@ -35244,7 +35251,7 @@ BI.Pane = BI.inherit(BI.Widget, {
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
height: 30, height: 30,
width: 30, width: 30,
hgap: 5.25, hgap: 5,
vgap: 2.5, vgap: 2.5,
items: [{ items: [{
type: "bi.layout", type: "bi.layout",

9
dist/bundle.js vendored

@ -10585,6 +10585,13 @@ if (!_global.BI) {
return sb; return sb;
}, },
init: function () {
// 先把准备环境准备好
while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()();
}
},
has: function (obj, keys) { has: function (obj, keys) {
if (BI.isArray(keys)) { if (BI.isArray(keys)) {
if (keys.length === 0) { if (keys.length === 0) {
@ -35648,7 +35655,7 @@ BI.Pane = BI.inherit(BI.Widget, {
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
height: 30, height: 30,
width: 30, width: 30,
hgap: 5.25, hgap: 5,
vgap: 2.5, vgap: 2.5,
items: [{ items: [{
type: "bi.layout", type: "bi.layout",

7
dist/core.js vendored

@ -10585,6 +10585,13 @@ if (!_global.BI) {
return sb; return sb;
}, },
init: function () {
// 先把准备环境准备好
while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()();
}
},
has: function (obj, keys) { has: function (obj, keys) {
if (BI.isArray(keys)) { if (BI.isArray(keys)) {
if (keys.length === 0) { if (keys.length === 0) {

9
dist/fineui.ie.js vendored

@ -10827,6 +10827,13 @@ if (!_global.BI) {
return sb; return sb;
}, },
init: function () {
// 先把准备环境准备好
while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()();
}
},
has: function (obj, keys) { has: function (obj, keys) {
if (BI.isArray(keys)) { if (BI.isArray(keys)) {
if (keys.length === 0) { if (keys.length === 0) {
@ -35486,7 +35493,7 @@ BI.Pane = BI.inherit(BI.Widget, {
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
height: 30, height: 30,
width: 30, width: 30,
hgap: 5.25, hgap: 5,
vgap: 2.5, vgap: 2.5,
items: [{ items: [{
type: "bi.layout", type: "bi.layout",

9
dist/fineui.js vendored

@ -10827,6 +10827,13 @@ if (!_global.BI) {
return sb; return sb;
}, },
init: function () {
// 先把准备环境准备好
while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()();
}
},
has: function (obj, keys) { has: function (obj, keys) {
if (BI.isArray(keys)) { if (BI.isArray(keys)) {
if (keys.length === 0) { if (keys.length === 0) {
@ -35890,7 +35897,7 @@ BI.Pane = BI.inherit(BI.Widget, {
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
height: 30, height: 30,
width: 30, width: 30,
hgap: 5.25, hgap: 5,
vgap: 2.5, vgap: 2.5,
items: [{ items: [{
type: "bi.layout", type: "bi.layout",

9
dist/fineui_without_jquery_polyfill.js vendored

@ -10585,6 +10585,13 @@ if (!_global.BI) {
return sb; return sb;
}, },
init: function () {
// 先把准备环境准备好
while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()();
}
},
has: function (obj, keys) { has: function (obj, keys) {
if (BI.isArray(keys)) { if (BI.isArray(keys)) {
if (keys.length === 0) { if (keys.length === 0) {
@ -24440,7 +24447,7 @@ BI.Pane = BI.inherit(BI.Widget, {
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
height: 30, height: 30,
width: 30, width: 30,
hgap: 5.25, hgap: 5,
vgap: 2.5, vgap: 2.5,
items: [{ items: [{
type: "bi.layout", type: "bi.layout",

7
dist/utils.js vendored

@ -11347,6 +11347,13 @@ if (!_global.BI) {
return sb; return sb;
}, },
init: function () {
// 先把准备环境准备好
while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()();
}
},
has: function (obj, keys) { has: function (obj, keys) {
if (BI.isArray(keys)) { if (BI.isArray(keys)) {
if (keys.length === 0) { if (keys.length === 0) {

2
src/base/pane.js

@ -55,7 +55,7 @@ BI.Pane = BI.inherit(BI.Widget, {
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
height: 30, height: 30,
width: 30, width: 30,
hgap: 5.25, hgap: 5,
vgap: 2.5, vgap: 2.5,
items: [{ items: [{
type: "bi.layout", type: "bi.layout",

7
src/core/base.js

@ -474,6 +474,13 @@ if (!_global.BI) {
return sb; return sb;
}, },
init: function () {
// 先把准备环境准备好
while (BI.prepares && BI.prepares.length > 0) {
BI.prepares.shift()();
}
},
has: function (obj, keys) { has: function (obj, keys) {
if (BI.isArray(keys)) { if (BI.isArray(keys)) {
if (keys.length === 0) { if (keys.length === 0) {

Loading…
Cancel
Save