Merge pull request #671 in VISUAL/fineui from ~ZHENFEI.LI/fineui:master to master

* commit '4e4f4c39b553cd4bc6fb9e324b821e3df5fa572f':
  BI-31697 IE下用一倍图
  BI-31697 pane的loading动画：矩形宽度调为3，解决有些浏览器对小数点像素的补正问题
  BI-31697 上传新的加载图标
  BI-31697 组件加载尺寸修改为30*30

dist/base.js

@@ -254,25 +254,25 @@ BI.Pane = BI.inherit(BI.Widget, {
         var loadingAnimation = BI.createWidget({
             type: "bi.horizontal",
             cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
-            height: 60,
+            height: 30,
-            width: 60,
+            width: 30,
-            hgap: 10,
+            hgap: 5.625,
-            vgap: 5,
+            vgap: 2.5,
             items: [{
                 type: "bi.layout",
                 cls: "rect1",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 2.5
             }, {
                 type: "bi.layout",
                 cls: "rect2",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 2.5
             }, {
                 type: "bi.layout",
                 cls: "rect3",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 2.5
             }]
         });
         // pane在同步方式下由items决定tipText的显示与否

dist/bundle.js

@@ -17650,13 +17650,13 @@ _.extend(BI, {
         }
     },
     pushDistinct: function (sArray, obj) {
-        if (!BI.contains(sArray, obj)) {
+        if (!BI.contains(obj)) {
             sArray.push(obj);
         }
     },
     pushDistinctArray: function (sArray, array) {
         for (var i = 0, len = array.length; i < len; i++) {
-            BI.pushDistinct(sArray, array[i]);
+            sArray.pushDistinct(array[i]);
         }
     }
 });
@@ -24411,11 +24411,34 @@ Expr = Sizzle.selectors = {
 				};
 		}),
 
-		"has": markFunction(function( selector ) {
+    pushArray: function (sArray, array) {
-			return function( elem ) {
+        for (var i = 0; i < array.length; i++) {
-				return Sizzle( selector, elem ).length > 0;
+            sArray.push(array[i]);
-			};
+        }
-		}),
+    },
+    pushDistinct: function (sArray, obj) {
+        if (!BI.contains(sArray, obj)) {
+            sArray.push(obj);
+        }
+    },
+    pushDistinctArray: function (sArray, array) {
+        for (var i = 0, len = array.length; i < len; i++) {
+            BI.pushDistinct(sArray, array[i]);
+        }
+    }
+});
+BI.prepares.push(function () {
+    BI.Date = BI.Date || {};
+    // 牵扯到国际化这些常量在页面加载后再生效
+    // full day names
+    BI.Date._DN = [BI.i18nText("BI-Basic_Sunday"),
+        BI.i18nText("BI-Basic_Monday"),
+        BI.i18nText("BI-Basic_Tuesday"),
+        BI.i18nText("BI-Basic_Wednesday"),
+        BI.i18nText("BI-Basic_Thursday"),
+        BI.i18nText("BI-Basic_Friday"),
+        BI.i18nText("BI-Basic_Saturday"),
+        BI.i18nText("BI-Basic_Sunday")];
 
 		"contains": markFunction(function( text ) {
 			return function( elem ) {
@@ -35611,25 +35634,25 @@ BI.Pane = BI.inherit(BI.Widget, {
         var loadingAnimation = BI.createWidget({
             type: "bi.horizontal",
             cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
-            height: 60,
+            height: 30,
-            width: 60,
+            width: 30,
-            hgap: 10,
+            hgap: 5.625,
-            vgap: 5,
+            vgap: 2.5,
             items: [{
                 type: "bi.layout",
                 cls: "rect1",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 2.5
             }, {
                 type: "bi.layout",
                 cls: "rect2",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 2.5
             }, {
                 type: "bi.layout",
                 cls: "rect3",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 2.5
             }]
         });
         // pane在同步方式下由items决定tipText的显示与否

dist/core.js

@@ -17650,13 +17650,13 @@ _.extend(BI, {
         }
     },
     pushDistinct: function (sArray, obj) {
-        if (!BI.contains(sArray, obj)) {
+        if (!BI.contains(obj)) {
             sArray.push(obj);
         }
     },
     pushDistinctArray: function (sArray, array) {
         for (var i = 0, len = array.length; i < len; i++) {
-            BI.pushDistinct(sArray, array[i]);
+            sArray.pushDistinct(array[i]);
         }
     }
 });
@@ -23485,7 +23485,34 @@ function Sizzle( selector, context, results, seed ) {
 		return [];
 	}
 
-	if ( !documentIsXML && !seed ) {
+    pushArray: function (sArray, array) {
+        for (var i = 0; i < array.length; i++) {
+            sArray.push(array[i]);
+        }
+    },
+    pushDistinct: function (sArray, obj) {
+        if (!BI.contains(sArray, obj)) {
+            sArray.push(obj);
+        }
+    },
+    pushDistinctArray: function (sArray, array) {
+        for (var i = 0, len = array.length; i < len; i++) {
+            BI.pushDistinct(sArray, array[i]);
+        }
+    }
+});
+BI.prepares.push(function () {
+    BI.Date = BI.Date || {};
+    // 牵扯到国际化这些常量在页面加载后再生效
+    // full day names
+    BI.Date._DN = [BI.i18nText("BI-Basic_Sunday"),
+        BI.i18nText("BI-Basic_Monday"),
+        BI.i18nText("BI-Basic_Tuesday"),
+        BI.i18nText("BI-Basic_Wednesday"),
+        BI.i18nText("BI-Basic_Thursday"),
+        BI.i18nText("BI-Basic_Friday"),
+        BI.i18nText("BI-Basic_Saturday"),
+        BI.i18nText("BI-Basic_Sunday")];
 
 		// Shortcuts
 		if ( (match = rquickExpr.exec( selector )) ) {

dist/fineui.js

@@ -17892,13 +17892,13 @@ _.extend(BI, {
         }
     },
     pushDistinct: function (sArray, obj) {
-        if (!BI.contains(sArray, obj)) {
+        if (!BI.contains(obj)) {
             sArray.push(obj);
         }
     },
     pushDistinctArray: function (sArray, array) {
         for (var i = 0, len = array.length; i < len; i++) {
-            BI.pushDistinct(sArray, array[i]);
+            sArray.pushDistinct(array[i]);
         }
     }
 });
@@ -24056,12 +24056,34 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// on a disconnected node (IE 9)
 			support.disconnectedMatch = matches.call( div, "div" );
 
-			// This should fail with an exception
+    pushArray: function (sArray, array) {
-			// Gecko does not error, returns false instead
+        for (var i = 0; i < array.length; i++) {
-			matches.call( div, "[s!='']:x" );
+            sArray.push(array[i]);
-			rbuggyMatches.push( "!=", pseudos );
+        }
-		});
+    },
-	}
+    pushDistinct: function (sArray, obj) {
+        if (!BI.contains(sArray, obj)) {
+            sArray.push(obj);
+        }
+    },
+    pushDistinctArray: function (sArray, array) {
+        for (var i = 0, len = array.length; i < len; i++) {
+            BI.pushDistinct(sArray, array[i]);
+        }
+    }
+});
+BI.prepares.push(function () {
+    BI.Date = BI.Date || {};
+    // 牵扯到国际化这些常量在页面加载后再生效
+    // full day names
+    BI.Date._DN = [BI.i18nText("BI-Basic_Sunday"),
+        BI.i18nText("BI-Basic_Monday"),
+        BI.i18nText("BI-Basic_Tuesday"),
+        BI.i18nText("BI-Basic_Wednesday"),
+        BI.i18nText("BI-Basic_Thursday"),
+        BI.i18nText("BI-Basic_Friday"),
+        BI.i18nText("BI-Basic_Saturday"),
+        BI.i18nText("BI-Basic_Sunday")];
 
 	rbuggyQSA = new RegExp( rbuggyQSA.join("|") );
 	rbuggyMatches = new RegExp( rbuggyMatches.join("|") );
@@ -35853,25 +35875,25 @@ BI.Pane = BI.inherit(BI.Widget, {
         var loadingAnimation = BI.createWidget({
             type: "bi.horizontal",
             cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
-            height: 60,
+            height: 30,
-            width: 60,
+            width: 30,
-            hgap: 10,
+            hgap: 5.625,
-            vgap: 5,
+            vgap: 2.5,
             items: [{
                 type: "bi.layout",
                 cls: "rect1",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 2.5
             }, {
                 type: "bi.layout",
                 cls: "rect2",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 2.5
             }, {
                 type: "bi.layout",
                 cls: "rect3",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 2.5
             }]
         });
         // pane在同步方式下由items决定tipText的显示与否

src/base/pane.js

@@ -53,25 +53,25 @@ BI.Pane = BI.inherit(BI.Widget, {
         var loadingAnimation = BI.createWidget({
             type: "bi.horizontal",
             cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
-            height: 60,
+            height: 30,
-            width: 60,
+            width: 30,
-            hgap: 10,
+            hgap: 5.25,
-            vgap: 5,
+            vgap: 2.5,
             items: [{
                 type: "bi.layout",
                 cls: "rect1",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 3
             }, {
                 type: "bi.layout",
                 cls: "rect2",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 3
             }, {
                 type: "bi.layout",
                 cls: "rect3",
-                height: 50,
+                height: 25,
-                width: 5
+                width: 3
             }]
         });
         // pane在同步方式下由items决定tipText的显示与否

src/less/base/pane.less

@@ -1,5 +1,6 @@
 @import "../index";
-@import "../resource/background";
+@import "../image";
+@import "../lib/icon";
 .bi-pane {
     min-height: 55px;
     & .loading-container {
@@ -8,9 +9,10 @@
 }
 
 .bi-loading-widget {
+    font-size: 0;
     div {
         .background-color(@background-color-highlight, 90%);
-        .border-radius(2.5px);
+        .border-radius(1.5px);
         .animation(loading-widget 0.8s infinite linear);
     }
     .rect2 {
@@ -28,7 +30,7 @@
         }
     });
     &.hack {
-        .loading-background;
+        .imagePath(@icon-wave-loading);
         div {
             .background-color(@background-color-highlight, 0%);
         }

src/less/lib/icon.less

@@ -41,6 +41,7 @@
 @icon-tree-vertical-line-4-theme-dark: "icon/dark/tree_vertical_line_4.png";
 
 @icon-loading: "icon/loading.gif";
+@icon-wave-loading: "icon/wave_loading.gif";
 
 //滑块
 @icon-slider-normal: "icon/slider_normal_small.png";