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
6 years ago · 2abd405354
10 changed files with 63 additions and 7 deletions
--- a/dist/base.js
+++ b/dist/base.js
@ -256,7 +256,7 @@ BI.Pane = BI.inherit(BI.Widget, {
            cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
            height: 30,
            width: 30,
-            hgap: 5.25,
+            hgap: 5,
            vgap: 2.5,
            items: [{
                type: "bi.layout",
--- a/dist/bundle.ie.js
+++ b/dist/bundle.ie.js
@ -10585,6 +10585,13 @@ if (!_global.BI) {
            return sb;
        },

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

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

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

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

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

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

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

+        init: function () {
+            // 先把准备环境准备好
+            while (BI.prepares && BI.prepares.length > 0) {
+                BI.prepares.shift()();
+            }
+        },
+
        has: function (obj, keys) {
            if (BI.isArray(keys)) {
                if (keys.length === 0) {