Merge remote-tracking branch 'origin/master'

Gruntfile.js

@@ -215,6 +215,8 @@ module.exports = function (grunt) {
             }
         },
 
+
+
         less: {
             demo: {
                 expand: true,
@@ -254,7 +256,7 @@ module.exports = function (grunt) {
 
         uglify: {
             options: {
-                banner: "/*! <%= pkg.name %> <%= grunt.template.today(\"dd-mm-yyyy\") %> */\n"
+                banner: "/*! <%= pkg.name %> <%= grunt.template.today(\"yyyy-mm-dd HH:MM:ss\") %> */\n"
             },
             dist: {
                 files: {
@@ -294,6 +296,23 @@ module.exports = function (grunt) {
                 }
             }
         },
+        copy: {
+            js: {
+                files: [
+                    {
+                        expand: true,
+                        cwd: "dist",
+                        src: [
+                            "fineui.js"
+                        ],
+                        dest: "dist/",
+                        rename: function (dest, src) {
+                            return dest + src.replace(".js", ".min.js");
+                        }
+                    }
+                ]
+            }
+        },
         watch: {
             scripts: {
                 files: ["src/**/*.js", "src/**/*.less", "demo/js/**/*.js", "demo/version.js", "demo/config.js", "demo/less/**/*.less"],
@@ -336,6 +355,7 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks("grunt-contrib-cssmin");
     grunt.loadNpmTasks("grunt-contrib-connect");
     grunt.loadNpmTasks("grunt-contrib-clean");
+    grunt.loadNpmTasks("grunt-contrib-copy");
 
     var defaultTask = ["clean", "less", "concat", "connect", "watch"];
     grunt.registerTask("default", defaultTask);
@@ -344,4 +364,5 @@ module.exports = function (grunt) {
         grunt.task.run(defaultTask);
     });
     grunt.registerTask("build", ["clean", "less", "cssmin", "concat", "uglify"]);
+    grunt.registerTask("fake-build", ["clean", "less", "cssmin", "concat", "copy"]);
 };

dist/bundle.js

@@ -26825,8 +26825,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         tooltip.element.height(tooltip.element[0].scrollHeight);
         this.showingTips[name] = true;
         // scale影响要计算在内
-        var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
-        var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
+        // var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
+        // var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
+        var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
         if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
             x -= tooltip.element.outerWidth() + 15;
         }
@@ -50923,6 +50924,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
 
         this.storeColors = BI.createWidget({
             type: "bi.color_picker",
+            cls: "bi-border-bottom bi-border-right",
             items: [[{
                 value: "",
                 disabled: true

dist/case.js

@@ -2339,6 +2339,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
 
         this.storeColors = BI.createWidget({
             type: "bi.color_picker",
+            cls: "bi-border-bottom bi-border-right",
             items: [[{
                 value: "",
                 disabled: true

dist/core.js

@@ -26825,8 +26825,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         tooltip.element.height(tooltip.element[0].scrollHeight);
         this.showingTips[name] = true;
         // scale影响要计算在内
-        var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
-        var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
+        // var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
+        // var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
+        var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
         if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
             x -= tooltip.element.outerWidth() + 15;
         }

dist/fineui.js

@@ -27064,8 +27064,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         tooltip.element.height(tooltip.element[0].scrollHeight);
         this.showingTips[name] = true;
         // scale影响要计算在内
-        var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
-        var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
+        // var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
+        // var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
+        var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
         if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
             x -= tooltip.element.outerWidth() + 15;
         }
@@ -51162,6 +51163,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
 
         this.storeColors = BI.createWidget({
             type: "bi.color_picker",
+            cls: "bi-border-bottom bi-border-right",
             items: [[{
                 value: "",
                 disabled: true

dist/fineui_without_jquery_polyfill.js

@@ -17210,8 +17210,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         tooltip.element.height(tooltip.element[0].scrollHeight);
         this.showingTips[name] = true;
         // scale影响要计算在内
-        var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
-        var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
+        // var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
+        // var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
+        var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
         if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
             x -= tooltip.element.outerWidth() + 15;
         }

package.json

@@ -10,6 +10,7 @@
     "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-connect": "^1.0.2",
+    "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-cssmin": "^1.0.1",
     "grunt-contrib-jshint": "^1.0.0",
     "grunt-contrib-less": "^1.4.1",
@@ -21,7 +22,8 @@
     "grunt": "grunt",
     "start": "node server.js",
     "build": "grunt build",
-    "compile": "grunt compile"
+    "compile": "grunt compile",
+    "fake": "grunt fake-build"
   },
   "repository": {
     "type": "git",

src/case/colorchooser/colorchooser.popup.js

@@ -29,6 +29,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
 
         this.storeColors = BI.createWidget({
             type: "bi.color_picker",
+            cls: "bi-border-bottom bi-border-right",
             items: [[{
                 value: "",
                 disabled: true

src/core/controller/controller.tooltips.js

@@ -86,8 +86,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         tooltip.element.height(tooltip.element[0].scrollHeight);
         this.showingTips[name] = true;
         // scale影响要计算在内
-        var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
-        var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
+        // var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
+        // var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
+        var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
         if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
             x -= tooltip.element.outerWidth() + 15;
         }