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

# Conflicts:
#	dist/fineui.min.js

Gruntfile.js

@@ -8,7 +8,7 @@ module.exports = function (grunt) {
                 separator: ""
             },
             polyfillJs: {
-                src: ["src/polyfill/**/*.js"],
+                src: ["src/core/foundation.js", "src/polyfill/**/*.js"],
                 dest: "dist/polyfill.js"
             },
             coreJs: {
@@ -335,7 +335,7 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks("grunt-contrib-concat");
     grunt.loadNpmTasks("grunt-contrib-cssmin");
     grunt.loadNpmTasks("grunt-contrib-connect");
-    grunt.loadNpmTasks('grunt-contrib-clean');
+    grunt.loadNpmTasks("grunt-contrib-clean");
 
     var defaultTask = ["less", "concat", "connect", "watch"];
     grunt.registerTask("default", defaultTask);

dist/fineui.js

@@ -1,4 +1,22 @@
-// Production steps of ECMA-262, Edition 5, 15.4.4.14
+/**
+ * Created by richie on 15/7/8.
+ */
+/**
+ * 初始化BI对象
+ */
+var _global;
+if (typeof window !== "undefined") {
+    _global = window;
+} else if (typeof global !== "undefined") {
+    _global = global;
+} else if (typeof self !== "undefined") {
+    _global = self;
+} else {
+    _global = this;
+}
+if (_global.BI == null) {
+    _global.BI = {};
+}// Production steps of ECMA-262, Edition 5, 15.4.4.14
 // Reference: http://es5.github.io/#x15.4.4.14
 if (!Array.prototype.indexOf) {
     Array.prototype.indexOf = function (searchElement, fromIndex) {

dist/polyfill.js

@@ -1,4 +1,22 @@
-// Production steps of ECMA-262, Edition 5, 15.4.4.14
+/**
+ * Created by richie on 15/7/8.
+ */
+/**
+ * 初始化BI对象
+ */
+var _global;
+if (typeof window !== "undefined") {
+    _global = window;
+} else if (typeof global !== "undefined") {
+    _global = global;
+} else if (typeof self !== "undefined") {
+    _global = self;
+} else {
+    _global = this;
+}
+if (_global.BI == null) {
+    _global.BI = {};
+}// Production steps of ECMA-262, Edition 5, 15.4.4.14
 // Reference: http://es5.github.io/#x15.4.4.14
 if (!Array.prototype.indexOf) {
     Array.prototype.indexOf = function (searchElement, fromIndex) {

package.json

@@ -20,7 +20,6 @@
   "scripts": {
     "grunt": "grunt",
     "start": "node server.js",
-    "uglify": "grunt min",
     "build": "grunt build",
     "compile": "grunt compile"
   },